From ba1ffaa1c6989873b57edc84491bfd1308b2190d Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Thu, 31 Oct 1996 02:57:12 +0000 Subject: update from main archive 961030 Thu Oct 31 00:01:39 1996 Ulrich Drepper * signal/Makefile (routines): Add sigwait. * signal/signal.h: Add prototype for sigwait. * sysdeps/posix/sigwait.c: New file. Implementation of sigwait function from POSIX.1c. * sysdeps/stub/sigwait.c: New file. Stub version of sigwait. Wed Oct 30 02:01:17 1996 Richard Henderson * sunrpc/xdr_float.c (xdr_float): Handle sizeof(float)!=sizeof(long), but don't bother going farther than sizeof(float)==sizeof(int). (xdr_double): Handle little-endian machines! Handle sizeof(double) != 2*sizeof(long), though again don't bother with more than int. Thu Oct 29 16:09:42 1996 Craig Metz * sysdeps/posix/getaddrinfo.c: Use buffer limits for inet_ntop function. Tue Oct 29 12:37:22 1996 Ulrich Drepper * Makerules: Create symbolic links for linking in $(libdir). (make-link): Use absolute path for destination if this is not in the same directory. * elf/rtld.c (dl_main): When verifying don't check the name of the dynamic linker. * shlib-versions: Change entries for Hurd specific libs from *-*-gnu* to *-*-gnu?* so that i586-pc-linux-gnu does not match these entries. * assert/assert.h: Reformat copyright. Change reference to ANSI into reference to ISO C. * ctype/ctype.h: Likewise. * errno.h: Likewise. * limits.h: Likewise. * math/math.h: Likewise. * setjmp/setjmp.h: Likewise. * stdio/stdio.h: Likewise. * libio/stdio.h: Likewise. * stdlib/stdlib.h: Likewise. * string/string.h: Likewise. * time/time.h: Likewise. * string/argz.h: Use __const is definitions. * elf/dlfcn.h: Use __const and __P. Reformat copyright. * misc/err.h: Likewise. * wctype/wctype.h (wctrans_t): Use __const instead of const. * Makeconfig ($(common-objpfx)soversions.mk): Generate list of sonames for versioned libraries. * Makefile: Remove code to generate libc-version.h. Generate gnu/lib-names.h with info from soversions.mk. * features.h: Define __GLIBC__ and __GLIBC_MINOR__. * dirent/tst-seekdir.c: Initialize save3. * grp/testgrp.c: Initialize my_group. * grp/fgetgrent_r.c: Change interface to follow POSIX.1c. * grp/grp.h: Likewise. * nss/getXXbyYY.c: Likewise. * nss/getXXbyYY_r.c: Likewise. * nss/getXXent.c: Likewise. * nss/getXXent_r.c: Likewise. * pwd/fgetpwent_r.c: Likewise. * pwd/pwd.h: Likewise. * shadow/fgetspent_r.c: Likewise. * shadow/sgetspent.c: Likewise. * shadow/sgetspent_r.c: Likewise. * grp/fgetgrent.c: Adapt for change in interface of fgetgrent_r. * pwd/fgetpwent.c: Likewise, for fgetpwent_r.c. * shadow/fgetspent.c: Likewise, for fgetpwent_r.c. * resolv/netdb.h: Adapt prototypes for reentrant functions to follow POSIX.1c. * sunrpc/rpc/netdb.h: Likewise, * shadow/shadow.h: Likewise. * inet/getnetgrent_r.c: Follow change in pwd/grp function interface. * sysdeps/unix/getlogin_r.c: Return ERANGE when buffer is too small. * inet/herrno.c: Don't define __h_errno. Only h_errno otherwise the ELF aliasing creates strange situations. * sysdeps/unix/sysv/linux/errnos.H: Define __set_errno as inline function. * sysdeps/unix/sysv/linux/i386/sysdep.S: Don't define __errno. * sysdeps/unix/sysv/linux/m68k/sysdep.S: Likewise. * libio/libio.h: Don't declare _IO_flockfile and _IO_funlockfile weak. * locale/programs/charmap.c: Add casts to prevent warnings. * locale/programs/linereader.h: Likewise. * locale/programs/ld-collate.c: Likewise. * locale/programs/stringtrans.c: Likewise. Change types for various variables to prevent warnings. * locale/programs/ld-ctype.c: Likewise. * locale/programs/linereader.h (lr_ungetc): Likewise. * locale/programs/charset.h (struct charset): Use `unsigned int' as type for width_default. * posix/regex.c: Change type of `this_reg' variables. * stdio-common/Makefile: Use -Wno-format for tstdiomisc.c. * stdio-common/bug5.c: De-ANSI-fy. Use correct types for variables. * stdio-common/printf_fp.c: Initialize to_shift. * stdio-common/test_rdwr.c: Add cast. * stdio-common/vfprintf.c: Add casts and use correct types to prevent warnings. * stdio-common/vfscanf.c: Initialize str and strptr. * sysdeps/libm-ieee754/e_jnf.c: Use correct types to prevent warnings. * sysdeps/libm-ieee754/e_pow.c: Likewise. * sysdeps/libm-ieee754/e_powf.c: Likewise. * sysdeps/libm-ieee754/e_rem_pio2f.c: Likewise. * time/test-tz.c: Likewise. * manual/creature.texi: Document _REENTRANT and _THREAD_SAFE. * manual/libc.texinfo: Prevent makeinfo failure by avoiding libc.cp index. This must be fixed. * manual/nss.texi: Adapt for correct POSIX.1c interface of reentrant functions. * manual/users.texi: Document netgroup functions. * po/es.po: Updated. * po/fr.po: Updated. * posix/fnmatch.c: Change to match libit version. * posix/unistd.h: Change prototype for ttyname_r to match POSIX.1c. * sysdep/posix/ttyname_r.c: Likewise. * stdlib/atexit.h (__new_exitfn): Add internal locking. * stdlib/exit.c: De-ANSI-fy. Handle new ef_us value for flavor. * stdlib/exit.h: De-ANSI-fy. Define new ef_us value for flavor. * stdlib/random.c (__srandom): Add internal locking. (__initstate): Likewise. (__setstate): Likewise. (__random): Likewise. Mon Oct 28 22:28:37 1996 NIIBE Yutaka * sysdeps/generic/crypt-entry.c (crypt_r): Use __set_errno. (crypt): Likewise. * resolv/gethnamaddr.c (gethostbyname2): Likewise. * sysdeps/generic/uname.c: Likewise. * sysdeps/posix/rename.c: Likewise. * sysdeps/stub/setrlimit.c: Likewise. * nss/nss_db/db-netgrp.c (_nss_db_setnetgrent): Fix typo. Sun Oct 27 11:12:50 1996 Andreas Schwab * locale/programs/ld-collate.c (collate_order_elem): Fix format string. (collate_element_to): Cast field width argument to `int' for format string. (collate_symbol): Likewise. (collate_order_elem): Likewise. (collate_weight_bsymbol): Likewise. (collate_simple_weight): Likewise. * locale/programs/ld-time.c (STRARR_ELEM): Fix format string. * locale/programs/ld-ctype.c (ctype_class_newP): Add missing argument for format string. (ctype_map_newP): Likewise. (set_class_defaults): Fix format string. * locale/programs/localedef.c (construct_output_path): Putting an explicit \0 into the format string does not work, use %c. Sat Oct 26 20:38:36 1996 Richard Henderson * Makerules: Install all shared libraries in $(slibdir). * login/Makefile: Build libutil.so in others pass after libc.so is created. * misc/mntent.h: Include for _PATH_MNTTAB & _PATH_MOUNTED. * string/stratcliff.c: Allocate 3 pages instead of one, then use mprotect so that we know that the adjacent pages are inaccessible. * resource/sys/resource.h: Move all structures and enums to ... * sysdeps/generic/resourcebits.h: ... here ... * sysdeps/unix/bsd/sun/sunos4/resourcebits.h: ... and here. * sysdeps/unix/sysv/linux/alpha/resourcebits.h: Remove. * sysdeps/unix/sysv/linux/i386/resourcebits.h: Remove. * sysdeps/unix/sysv/linux/m68k/resourcebits.h: Remove. * sysdeps/unix/sysv/linux/mips/resourcebits.h: Remove. * sysdeps/unix/sysv/linux/resourcebits.h: New file. Use kernel header for RLIMIT_* definitions. The members of struct rlimit are longs. Thu Oct 24 17:43:34 1996 Andreas Schwab * MakeTAGS (sysdep-dirs): Fix typo. Wed Oct 23 03:45:22 1996 Ulrich Drepper * Makefile (headers): Don't mention libc-version.h. (install-others): ...but here. * time/strptime.c: Recognize %s, %u, %g, and %G format. nothing is found. This guarantees all subsequent calls behave * sysdeps/unix/sysv/linux/syscalls.list: Change function name for * io/getwd.c (getwd) [! PATH_MAX]: Don't assume that the user's buffer is any longer than the amount necessary to hold the filename; the Hurd getcwd uses the *entire* contents of the buffer, however long it is specified to be. * posix/getconf.c: De-ANSI-fy. Recognize POSIX.2 constant names. since these do not depend on the platform. --- shadow/fgetspent.c | 6 ++++-- shadow/fgetspent_r.c | 12 +++++++----- shadow/sgetspent.c | 6 ++++-- shadow/sgetspent_r.c | 12 +++++++----- shadow/shadow.h | 50 +++++++++++++++++++++++++------------------------- 5 files changed, 47 insertions(+), 39 deletions(-) (limited to 'shadow') diff --git a/shadow/fgetspent.c b/shadow/fgetspent.c index d6c4e4f..8782b6b 100644 --- a/shadow/fgetspent.c +++ b/shadow/fgetspent.c @@ -25,7 +25,9 @@ struct spwd * fgetspent (FILE *stream) { static char buffer[BUFSIZ]; - static struct spwd result; + static struct spwd resbuf; + struct spwd *result; - return __fgetspent_r (stream, &result, buffer, sizeof buffer); + return __fgetspent_r (stream, &resbuf, buffer, sizeof buffer, &result) + ? NULL : result; } diff --git a/shadow/fgetspent_r.c b/shadow/fgetspent_r.c index 6521517..0cdcc76 100644 --- a/shadow/fgetspent_r.c +++ b/shadow/fgetspent_r.c @@ -32,8 +32,9 @@ struct spent_data {}; /* Read one shadow entry from the given stream. */ -struct spwd * -__fgetspent_r (FILE *stream, struct spwd *result, char *buffer, int buflen) +int +__fgetspent_r (FILE *stream, struct spwd *resbuf, char *buffer, size_t buflen, + struct spwd **result) { char *p; @@ -41,7 +42,7 @@ __fgetspent_r (FILE *stream, struct spwd *result, char *buffer, int buflen) { p = fgets (buffer, buflen, stream); if (p == NULL) - return NULL; + return errno; /* Skip leading blanks. */ while (isspace (*p)) @@ -49,8 +50,9 @@ __fgetspent_r (FILE *stream, struct spwd *result, char *buffer, int buflen) } while (*p == '\0' || *p == '#' || /* Ignore empty and comment lines. */ /* Parse the line. If it is invalid, loop to get the next line of the file to parse. */ - ! parse_line (buffer, (void *) result, NULL, 0)); + ! parse_line (buffer, (void *) resbuf, NULL, 0)); - return result; + *result = resbuf; + return 0; } weak_alias (__fgetspent_r, fgetspent_r) diff --git a/shadow/sgetspent.c b/shadow/sgetspent.c index a3c61f9..d18e5d7 100644 --- a/shadow/sgetspent.c +++ b/shadow/sgetspent.c @@ -28,9 +28,10 @@ Cambridge, MA 02139, USA. */ struct spwd * sgetspent (const char *string) { - static struct spwd result; + static struct spwd resbuf; static int max_size = 0; static char *buffer = NULL; + struct spwd *result; int len; len = strlen (string) + 1; @@ -42,5 +43,6 @@ sgetspent (const char *string) return NULL; } - return __sgetspent_r (string, &result, buffer, max_size); + return __sgetspent_r (string, &resbuf, buffer, max_size, &result) + ? NULL : result; } diff --git a/shadow/sgetspent_r.c b/shadow/sgetspent_r.c index 407886e..5270a2a 100644 --- a/shadow/sgetspent_r.c +++ b/shadow/sgetspent_r.c @@ -68,11 +68,13 @@ LINE_PARSER /* Read one shadow entry from the given stream. */ -struct spwd * -__sgetspent_r (const char *string, struct spwd *result, char *buffer, - int buflen) +int +__sgetspent_r (const char *string, struct spwd *resbuf, char *buffer, + size_t buflen, struct spwd **result) { - return parse_line (strncpy (buffer, string, buflen), result, NULL, 0) - ? result : NULL; + *result = parse_line (strncpy (buffer, string, buflen), resbuf, NULL, 0) + ? resbuf : NULL; + + return *result == NULL ? errno : 0; } weak_alias (__sgetspent_r, sgetspent_r) diff --git a/shadow/shadow.h b/shadow/shadow.h index 133cfd6..c27cc9a 100644 --- a/shadow/shadow.h +++ b/shadow/shadow.h @@ -74,31 +74,31 @@ extern int putspent __P ((__const struct spwd *__p, FILE *__stream)); #ifdef __USE_REENTRANT /* Reentrant versions of some of the functions above. */ -extern struct spwd *__getspent_r __P ((struct spwd *__result_buf, - char *__buffer, int __buflen)); -extern struct spwd *getspent_r __P ((struct spwd *__result_buf, - char *__buffer, int __buflen)); - -extern struct spwd *__getspnam_r __P ((__const char *__name, - struct spwd *__result_buf, - char *__buffer, int __buflen)); -extern struct spwd *getspnam_r __P ((__const char *__name, - struct spwd *__result_buf, - char *__buffer, int __buflen)); - -extern struct spwd *__sgetspent_r __P ((__const char *__string, - struct spwd *__result_buf, - char *__buffer, int __buflen)); -extern struct spwd *sgetspent_r __P ((__const char *__string, - struct spwd *__result_buf, - char *__buffer, int __buflen)); - -extern struct spwd *__fgetspent_r __P ((FILE *__stream, - struct spwd *__result_buf, - char *__buffer, int __buflen)); -extern struct spwd *fgetspent_r __P ((FILE *__stream, - struct spwd *__result_buf, - char *__buffer, int __buflen)); +extern int __getspent_r __P ((struct spwd *__result_buf, char *__buffer, + size_t __buflen, struct spwd **__result)); +extern int getspent_r __P ((struct spwd *__result_buf, char *__buffer, + size_t __buflen, struct spwd **__result)); + +extern int __getspnam_r __P ((__const char *__name, struct spwd *__result_buf, + char *__buffer, size_t __buflen, + struct spwd **__result)); +extern int getspnam_r __P ((__const char *__name, struct spwd *__result_buf, + char *__buffer, size_t __buflen, + struct spwd **__result)); + +extern int __sgetspent_r __P ((__const char *__string, + struct spwd *__result_buf, char *__buffer, + size_t __buflen, struct spwd **__result)); +extern int sgetspent_r __P ((__const char *__string, struct spwd *__result_buf, + char *__buffer, size_t __buflen, + struct spwd **__result)); + +extern int __fgetspent_r __P ((FILE *__stream, struct spwd *__result_buf, + char *__buffer, size_t __buflen, + struct spwd **__result)); +extern int fgetspent_r __P ((FILE *__stream, struct spwd *__result_buf, + char *__buffer, size_t __buflen, + struct spwd **__result)); #endif /* reentrant */ -- cgit v1.1