From 0200214b288810fc261b0b65c32f7068fcfa9b40 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Wed, 29 May 1996 04:48:04 +0000 Subject: Tue May 28 04:38:10 1996 Ulrich Drepper * 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 * 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. --- login/getutid_r.c | 34 ++++++++++++++++++++++++++++++++-- 1 file changed, 32 insertions(+), 2 deletions(-) (limited to 'login/getutid_r.c') diff --git a/login/getutid_r.c b/login/getutid_r.c index 351f96e65e..02013c29b9 100644 --- a/login/getutid_r.c +++ b/login/getutid_r.c @@ -18,6 +18,7 @@ not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include +#include #include #include @@ -28,6 +29,18 @@ int getutid_r (const struct utmp *id, struct utmp **utmp, struct utmp_data *utmp_data) { +#if (_HAVE_UT_ID - 0) && (_HAVE_UT_TYPE - 0) + /* Test whether ID has any of the legal types. */ + if (id->ut_type != RUN_LVL && id->ut_type != BOOT_TIME + && id->ut_type != OLD_TIME && id->ut_type != NEW_TIME + && id->ut_type != INIT_PROCESS && id->ut_type != LOGIN_PROCESS + && id->ut_type != USER_PROCESS && id->ut_type != DEAD_PROCESS) + /* No, using '<' and '>' for the test is not possible. */ + { + errno = EINVAL; + return -1; + } + /* Open utmp file if not already done. */ if (utmp_data->ut_fd == -1) { @@ -40,7 +53,7 @@ getutid_r (const struct utmp *id, 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)) @@ -52,10 +65,27 @@ getutid_r (const struct utmp *id, struct utmp **utmp, /* Update position pointer. */ utmp_data->loc_utmp += sizeof (struct utmp); + + if ((id->ut_type == RUN_LVL || id->ut_type == BOOT_TIME + || id->ut_type == OLD_TIME || id->ut_type == NEW_TIME) + && id->ut_type != utmp_data->ubuf.ut_type) + /* Stop at the next entry with type RUN_LVL, BOOT_TIME, + OLD_TIME, or NEW_TIME. */ + break; + + if ((id->ut_type == INIT_PROCESS || id->ut_type == LOGIN_PROCESS + || id->ut_type == USER_PROCESS || id->ut_type == DEAD_PROCESS) + && strncmp (id->ut_id, utmp_data->ubuf.ut_id, sizeof id->ut_id) == 0) + /* Stop at the next entry with the specified ID and with type + INIT_PROCESS, LOGIN_PROCESS, USER_PROCESS, or DEAD_PROCESS. */ + break; } - while (id->ut_type != utmp_data->ubuf.ut_type); *utmp = &utmp_data->ubuf; return 0; +#else /* !_HAVE_UT_ID && !_HAVE_UT_TYPE */ + errno = ENOSYS; + return -1; +#endif } -- cgit v1.2.3