diff options
author | Roland McGrath <roland@gnu.org> | 1996-05-29 04:48:04 +0000 |
---|---|---|
committer | Roland McGrath <roland@gnu.org> | 1996-05-29 04:48:04 +0000 |
commit | 0200214b288810fc261b0b65c32f7068fcfa9b40 (patch) | |
tree | a488a0a435ccf62b0870121b839b08de0d37a9b5 /login/getutline_r.c | |
parent | 215dbbb1508bd6b86211112dd5ddaf9bd2290690 (diff) | |
download | glibc-0200214b288810fc261b0b65c32f7068fcfa9b40.zip glibc-0200214b288810fc261b0b65c32f7068fcfa9b40.tar.gz glibc-0200214b288810fc261b0b65c32f7068fcfa9b40.tar.bz2 |
Tue May 28 04:38:10 1996 Ulrich Drepper <drepper@cygnus.com>
* limits.h: Change MB_LEN_MAX to 6. A 31-bit ISO 10646
character in UTF-8 encoding has that many bytes.
* locale/langinfo.h: New element _NL_CTYPE_MB_CUR_MAX.
* locale/categories.def: Add description of field _NL_CTYPE_MB_CUR_MAX.
* locale/Makefile (routines): Add mb_cur_max.
* locale/mb_cur_max.c: New file. This function gets called
when the macro MB_CUR_MAX is used.
* locale/C-ctype.c: Initialize new mb_cur_max field.
* locale/localeinfo.h: Change magic value because of incompatible
change.
* locale/programs/ld-ctype.c: Determine value of mb_cur_max
according to current character set and write it out with the rest.
* stdlib/stdlib.h (MB_CUR_MAX): Not constant anymore. Get value
according to currently used locale for catefory LC_CTYPE by
calling the function __ctype_get_mb_cur_max.
Tue May 28 03:27:46 1996 Ulrich Drepper <drepper@cygnus.com>
* FAQ: Fix some typos.
Tell that for Linux the kernel header files are necessary.
* PROJECTS: New file. List of open jobs for glibc.
* Makefile (distribute): Add PROJECTS.
* crypt/GNUmakefile (headers): New variable. Mention crypt.h.
* crypt/crypt.h: Header for crypt functions.
* elf/elf.h: Add some new constants from recent Cygnus ELF
header files.
* login/getutid_r.c: Test for correct type.
Don't depend on ut_type and ut_id unless _HAVE_UT_TYPE and
_HAVE_UT_ID resp. are defined.
Make really compliant with specification.
* login/getutline_r.c, login/pututline_r.c: Don't depend on
ut_type and ut_id unless _HAVE_UT_TYPE and _HAVE_UT_ID resp. are
defined.
Make really compliant with specification.
* login/setutent_r.c: Don't depend on ut_type and ut_id unless
_HAVE_UT_TYPE and _HAVE_UT_ID resp. are defined.
* login/login.c, login/logout.c, login/logwtmp.c: Complete
rewrite. Now based on getut*/setut* functions.
* stdlib/strtol.c: Undo changes of Wed May 22 01:48:54 1996.
This prevented using this file in other GNU packages.
* sysdeps/gnu/utmpbits.h: Define _HAVE_UT_TYPE, _HAVE_UT_ID,
and _HAVE_UT_TV because struct utmp has these members.
* sysdeps/libm-i387/e_exp.S: Correct exp(+-Inf) case.
* utmp.h: New file. Wrapper around login/utmp.h.
* elf/dl-error.c (struct catch): New type.
(catch): New static variable, struct catch *.
(catch_env, signalled_errstring, signalled_objname): Variables removed.
(_dl_signal_error): If CATCH is non-null, set its errstring and
objname members and jump to CATCH->env. If it is null, call
_dl_sysdep_fatal with a standard message.
* elf/rtld.c (dl_main): Explode `doit' function into dl_main's body.
No longer use _dl_catch_error.
Diffstat (limited to 'login/getutline_r.c')
-rw-r--r-- | login/getutline_r.c | 23 |
1 files changed, 19 insertions, 4 deletions
diff --git a/login/getutline_r.c b/login/getutline_r.c index 8df4878..0956164 100644 --- a/login/getutline_r.c +++ b/login/getutline_r.c @@ -18,9 +18,9 @@ not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include <errno.h> +#include <string.h> #include <unistd.h> #include <utmp.h> -#include <string.h> /* For implementing this function we don't use the getutent_r function @@ -41,7 +41,7 @@ getutline_r (const struct utmp *line, struct utmp **utmp, if (lseek (utmp_data->ut_fd, utmp_data->loc_utmp, SEEK_SET) == -1) return -1; - do + while (1) { /* Read the next entry. */ if (read (utmp_data->ut_fd, &utmp_data->ubuf, sizeof (struct utmp)) @@ -53,9 +53,24 @@ getutline_r (const struct utmp *line, struct utmp **utmp, /* Update position pointer. */ utmp_data->loc_utmp += sizeof (struct utmp); + +#if _HAVE_UT_TYPE - 0 + if (utmp_data->ubuf.ut_type == USER_PROCESS + && strncmp (line->ut_line, utmp_data->ubuf.ut_line, + sizeof line->ut_line) == 0) + /* Stop if we found an user entry. */ + break; + + if (utmp_data->ubuf.ut_type == LOGIN_PROCESS) + /* Stop if we found a login entry. */ + break; +#else /* !_HAVE_UT_TYPE */ + if (strncmp (line->ut_line, utmp_data->ubuf.ut_line, + sizeof line->ut_line) == 0) + /* Stop if the line match. */ + break; +#endif } - while (strncmp (line->ut_line, utmp_data->ubuf.ut_line, - sizeof line->ut_line)); *utmp = &utmp_data->ubuf; |