From 7ce241a03e2c0b49482d9d05c8ddb765e89a01d9 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Sat, 8 Aug 1998 20:02:34 +0000 Subject: Update. 1998-07-31 17:59 Ulrich Drepper * sysdeps/generic/bits/byteswap.h: Fix problems with side effects. * manual/filesys.texi: Document truncate and ftruncate. Patch by Michael Deutschmann . * shadow/putspent.c: Lock stream while generating the output. * sunrpc/clnt_unix.c: Use ucred instead of cmsgcred again. (__msgwrite): Rewrite accordingly. * sunrpc/svc_unix.c: Likewise. * sysdeps/unix/sysv/linux/Dist: Remove __recvmsg.S and __sendmsg.S. * sysdeps/unix/sysv/linux/Makefile [$(subdir)==socket] (sysdep_routines): Remove __sendmsg and __recvmsg. * sysdeps/unix/sysv/linux/__recvmsg.S: Removed. * sysdeps/unix/sysv/linux/__sendmsg.S: Removed. * sysdeps/unix/sysv/linux/recvmsg.c: Removed. * sysdeps/unix/sysv/linux/sendmsg.c: Removed. * sysdeps/unix/sysv/linux/recvmsg.S: New file. * sysdeps/unix/sysv/linux/sendmsg.S: New file. * sysdeps/unix/sysv/linux/bits/socket.h: Define SCM_CREDENTIALS and struct ucred. Remove struct cmsgcred. Patches by Thorsten Kukuk. 1998-08-03 Andreas Jaeger * inet/rcmd.c (__ivaliduser): Allow '#' as comment character. 1998-08-08 14:42 Ulrich Drepper * argp/argp-help.c: Prepare to be used outside glibc without gcc by adding usual alloca cruft. Reported by Eleftherios Gkioulekas . 1998-04-05 Jim Meyering * lib/regex.c (WIDE_CHAR_SUPPORT): Define. This now depends on HAVE_BTOWC so systems that lack btowc (like solaris-2.5.1) don't lose. 1998-08-07 Mark Kettenis * sysdeps/generic/bits/sigaction.h: Remove definition of SA_DISABLE. * sysdeps/generic/bits/sigstack.h: Define SS_DISABLE, SS_ONSTACK, MINSIGSTKZ and SIGSTKSZ. Definitions match BSD. * hurd/sigunwind.c (_hurdsig_longjmp_from_handler): Use SS_ONSTACK instead of SA_ONSTACK. * sysdeps/mach/hurd/sigaltstack.c (__sigaltstack): Renamed from sigaltstack, and created a weak alias. Use SS_DISABLE and SS_ONSTACK instead of SA_DISABLE and SA_ONSTACK. * sysdeps/mach/hurd/sigstack.c (sigstack): Use SS_ONSTACK instead of SA_ONSTACK. Call __sigaltstack instead of sigaltstack. * sysdeps/mach/hurd/i386/sigreturn.c (__sigreturn): Use SS_ONSTACK instead of SA_ONSTACK. * sysdeps/mach/hurd/alpha/sigreturn.c (__sigreturn): Likewise. * sysdeps/mach/hurd/mips/sigreturn.c (__sigreturn): Likewise. * sysdeps/mach/hurd/i386/trampoline.c (_hurd_setup_sighandler): Use SS_DISABLE instead of SA_DISABLE. Use SS_ONSTACK instead of SA_ONSTACK where appropriate. * sysdeps/mach/hurd/alpha/trampoline.c (_hurd_setup_sighandler): Likewise. * sysdeps/mach/hurd/hppa/trampoline.c (_hurd_setup_sighandler): Likewise. * sysdeps/mach/hurd/mips/trampoline.c (_hurd_setup_sighandler): Likewise. * manual/signal.texi (Signal Stack): Talk about SS_DISABLE and SS_ONSTACK instead of SA_DISABLE and SA_ONSTACK in discussion of the `ss_flags' member of `struct sigaltstack'. 1998-08-05 Andreas Schwab * libio/Makefile (routines) [$(versioning)=yes]: Add oldtmpfile. (shared-only-routines): Likewise. * libio/oldtmpfile.c: New file * stdio-common/tmpfile.c: Use __fdopen and __close. [USE_IN_LIBIO]: Use _IO_fdopen instead of _IO_new_fdopen. Put tmpfile on symbol version GLIBC_2.1. * stdio-common/tmpfile64.c: Use __fdopen and __close. [USE_IN_LIBIO]: Use _IO_fdopen instead of _IO_new_fdopen. * stdio-common/Version [GLIBC_2.1]: Add tmpfile. * stdio-common/tempnam.c: Use __strdup instead of strdup. * sysdeps/posix/fdopen.c: Define __fdopen and make fdopen weak alias. * sysdeps/generic/fdopen.c: Likewise. * sysdeps/mach/hurd/fdopen.c: Likewise. * stdio/stdio.h: Declare __fdopen. * sunrpc/openchild.c: Use __fdopen instead of fdopen. [USE_IN_LIBIO]: Map __fdopen to _IO_fdopen. * sysdeps/posix/tempname.c (__gen_tempname): Don't bother checking __stub_open64, it is never defined. 1998-08-05 Andreas Schwab * libio/iofopen64.c: Fix typo. Avoid unnessary casts. * libio/iopopen.c: Unlink file before freeing it if command creation failed. Avoid unnessary casts. * libio/iofdopen.c: Avoid unnecessary cast. * pwd/fgetpwent_r.c [USE_IN_LIBIO]: Map funlockfile to _IO_funlockfile. * pwd/fgetspent_r.c [USE_IN_LIBIO]: Likewise. 1998-08-06 Andreas Schwab * grp/grp.h, pwd/pwd.h: Don't declare __grpopen, __grpread, __grpalloc, __grpscan and the corresponding pwd functions, they were removed long ago. 1998-08-06 Andreas Schwab * math/libm-test.c (csqrt_test): Adjust epsilons. (casinh_test): Likewise. 1998-08-06 Andreas Schwab * posix/globtest.sh: Fix typo. Remove second test output file. 1998-08-07 Cristian Gafton * pwd/putpwent.c (putpwent): Avoid writting (none) in the passwd file. * shadow/putspent.c (putspent): Likewise. * grp/putgrent.c: New file. * grp/Makefile (routines): Add putgrent. * grp/Versions [GLIBC_2.1]: Add putgrent. * grp/grp.h: Add putgrent prototype. 1998-08-04 19:33 Ulrich Drepper * elf/elf.h: More ELF definitions. --- shadow/fgetspent_r.c | 1 + shadow/putspent.c | 29 ++++++++++++++++++++--------- 2 files changed, 21 insertions(+), 9 deletions(-) (limited to 'shadow') diff --git a/shadow/fgetspent_r.c b/shadow/fgetspent_r.c index bedc36182e..50d1fd9972 100644 --- a/shadow/fgetspent_r.c +++ b/shadow/fgetspent_r.c @@ -23,6 +23,7 @@ #ifdef USE_IN_LIBIO # define flockfile(s) _IO_flockfile (s) +# define funlockfile(s) _IO_funlockfile (s) #endif /* Define a line parsing function using the common code diff --git a/shadow/putspent.c b/shadow/putspent.c index 0e8649bc2c..a952a22169 100644 --- a/shadow/putspent.c +++ b/shadow/putspent.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1992, 1996, 1997 Free Software Foundation, Inc. +/* Copyright (C) 1991, 1992, 1996, 1997, 1998 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -19,6 +19,13 @@ #include #include +#ifdef USE_IN_LIBIO +# define flockfile(s) _IO_flockfile (s) +# define funlockfile(s) _IO_funlockfile (s) +#endif + +#define _S(x) x ? x : "" + /* Write an entry to the given stream. This must know the format of the password file. */ @@ -27,51 +34,55 @@ putspent (const struct spwd *p, FILE *stream) { int errors = 0; - if (fprintf (stream, "%s:%s:", p->sp_namp, p->sp_pwdp) < 0) + flockfile (stream); + + if (fprintf (stream, "%s:%s:", p->sp_namp, _S (p->sp_pwdp)) < 0) ++errors; if ((p->sp_lstchg != (long int) -1 && fprintf (stream, "%ld:", p->sp_lstchg) < 0) || (p->sp_lstchg == (long int) -1 - && putc (':', stream) == EOF)) + && putc_unlocked (':', stream) == EOF)) ++errors; if ((p->sp_min != (long int) -1 && fprintf (stream, "%ld:", p->sp_min) < 0) || (p->sp_min == (long int) -1 - && putc (':', stream) == EOF)) + && putc_unlocked (':', stream) == EOF)) ++errors; if ((p->sp_max != (long int) -1 && fprintf (stream, "%ld:", p->sp_max) < 0) || (p->sp_max == (long int) -1 - && putc (':', stream) == EOF)) + && putc_unlocked (':', stream) == EOF)) ++errors; if ((p->sp_warn != (long int) -1 && fprintf (stream, "%ld:", p->sp_warn) < 0) || (p->sp_warn == (long int) -1 - && putc (':', stream) == EOF)) + && putc_unlocked (':', stream) == EOF)) ++errors; if ((p->sp_inact != (long int) -1 && fprintf (stream, "%ld:", p->sp_inact) < 0) || (p->sp_inact == (long int) -1 - && putc (':', stream) == EOF)) + && putc_unlocked (':', stream) == EOF)) ++errors; if ((p->sp_expire != (long int) -1 && fprintf (stream, "%ld:", p->sp_expire) < 0) || (p->sp_expire == (long int) -1 - && putc (':', stream) == EOF)) + && putc_unlocked (':', stream) == EOF)) ++errors; if (p->sp_flag != ~0ul && fprintf (stream, "%ld", p->sp_flag) < 0) ++errors; - if (putc ('\n', stream) == EOF) + if (putc_unlocked ('\n', stream) == EOF) ++errors; + funlockfile (stream); + return errors ? -1 : 0; } -- cgit v1.2.3-65-gdbad