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. --- grp/Makefile | 2 +- grp/Versions | 4 ++++ grp/grp.h | 22 +++++------------- grp/putgrent.c | 70 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 80 insertions(+), 18 deletions(-) create mode 100644 grp/putgrent.c (limited to 'grp') diff --git a/grp/Makefile b/grp/Makefile index ac889218c1..0d13495bd8 100644 --- a/grp/Makefile +++ b/grp/Makefile @@ -23,7 +23,7 @@ subdir := grp headers := grp.h routines := fgetgrent initgroups setgroups \ - getgrent getgrgid getgrnam \ + getgrent getgrgid getgrnam putgrent \ getgrent_r getgrgid_r getgrnam_r fgetgrent_r tests := testgrp diff --git a/grp/Versions b/grp/Versions index 1e13e5574c..1615b24186 100644 --- a/grp/Versions +++ b/grp/Versions @@ -16,4 +16,8 @@ libc { # s* setgrent; setgroups; } + GLIBC_2.1 { + # p* + putgrent; + } } diff --git a/grp/grp.h b/grp/grp.h index 265f3c2003..7e73625741 100644 --- a/grp/grp.h +++ b/grp/grp.h @@ -54,23 +54,6 @@ struct group # include #endif -#ifdef __USE_GNU -/* Return a new stream open on the group file. */ -extern FILE *__grpopen __P ((void)); - -/* Read a group entry from STREAM, filling in G. - Return the `struct group' of G if successful, NULL on failure. */ -extern struct group *__grpread __P ((FILE *__stream, __ptr_t __g)); - -/* Return a chunk of memory containing pre-initialized data for __grpread. */ -extern __ptr_t __grpalloc __P ((void)); - -/* Scan the group file, filling in G, until SELECTOR returns nonzero for an - entry. Return the `struct group' of G if successful, NULL on failure. */ -extern struct group *__grpscan __P ((__ptr_t *__p, - int (*__selector) (struct group *))); -#endif - #if defined __USE_SVID || defined __USE_BSD || defined __USE_XOPEN_EXTENDED /* Rewind the group-file stream. */ @@ -88,6 +71,11 @@ extern struct group *getgrent __P ((void)); extern struct group *fgetgrent __P ((FILE *__stream)); #endif +#ifdef __USE_GNU +/* Write the given entry onto the given stream. */ +extern int putgrent __P ((__const struct group *__p, FILE *__f)); +#endif + /* Search for an entry with a matching group ID. */ extern struct group *getgrgid __P ((__gid_t __gid)); diff --git a/grp/putgrent.c b/grp/putgrent.c new file mode 100644 index 0000000000..7d7732a9c8 --- /dev/null +++ b/grp/putgrent.c @@ -0,0 +1,70 @@ +/* Copyright (C) 1991, 1992, 1996, 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 + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + +#include +#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 group file. */ +int +putgrent (gr, stream) + const struct group *gr; + FILE *stream; +{ + int retval; + + if (gr == NULL || stream == NULL) + { + __set_errno (EINVAL); + return -1; + } + + flockfile (stream); + + retval = fprintf (stream, "%s:%s:%u:", + gr->gr_name, _S (gr->gr_passwd), gr->gr_gid); + if (retval < 0) + return -1; + + if (gr->gr_mem != NULL) + { + int i; + + for (i = 0 ; gr->gr_mem[i] != NULL; i++) + if (fprintf (stream, "%c%s", i == 0 ? ':' : ',', gr->gr_mem[i]) < 0) + { + /* What else can we do? */ + funlockfile (stream); + return -1; + } + } + + retval = fputc_unlocked ('\n', stream); + + funlockfile (stream); + + return retval < 0 ? -1 : 0; +} -- cgit v1.2.3