mirror of
git://sourceware.org/git/glibc.git
synced 2024-12-21 04:31:04 +08:00
acd7f096d7
This patch completes the headers cleanup consequent on removal of _BSD_SOURCE and _SVID_SOURCE (apart from any subsequent deprecations): * #endif conditionals that referred to BSD or SVID are updated. * Redundant __USE_* tests in cases involving __USE_MISC are removed. This includes cases such as __USE_MISC || __USE_ISOC99, where __USE_MISC is redundant (because __USE_MISC is only ever defined in the default / _DEFAULT_SOURCE / _GNU_SOURCE case, when __USE_ISOC99 is also defined; the same applies to the non-XSI-extended POSIX versions), and cases involving __USE_GNU, where __USE_GNU is redundant (because if __USE_GNU is defined, so are the other __USE_* macros). There may well be other cases of __USE_FOO || __USE_BAR tests that could be simplified because one macro implies the other; this patch only addresses cases involving __USE_MISC. Tested x86_64. * bits/fcntl.h [__USE_MISC]: Remove redundant conditionals. * bits/sigaction.h [__USE_MISC]: Likewise. * bits/waitstatus.h: Update #endif comments. * ctype/ctype.h: Likewise. * dirent/dirent.h: Likewise. [__USE_MISC]: Remove redundant conditionals. * grp/grp.h: Update #endif comments. [__USE_GNU]: Remove redundant conditionals. [__USE_MISC]: Likewise. * inet/netinet/in.h [__USE_GNU]: Likewise. * io/sys/stat.h [__USE_MISC]: Likewise. * libio/bits/stdio-ldbl.h [__USE_MISC]: Likewise. * libio/bits/stdio.h: Update #endif comments. [__USE_MISC]: Remove redundant conditionals. * libio/bits/stdio2.h [__USE_MISC]: Likewise. * libio/stdio.h: Update #endif comments. [__USE_MISC]: Remove redundant conditionals. * math/bits/math-finite.h [__USE_MISC]: Likewise. * math/bits/mathcalls.h [__USE_MISC]: Likewise. * math/math.h: Update #else and #endif comments. [__USE_MISC]: Remove redundant conditionals. * misc/sys/uio.h: Update #endif comments. * posix/bits/unistd.h [__USE_MISC]: Remove redundant conditionals. * posix/glob.h [__USE_MISC]: Likewise. * posix/sys/types.h: Update #endif comments. [__USE_MISC]: Remove redundant conditionals. * posix/sys/wait.h: Update #endif comments. [__USE_MISC]: Remove redundant conditionals. * posix/unistd.h: Update #endif comments. [__USE_MISC]: Remove redundant conditionals. * pwd/pwd.h [__USE_GNU]: Likewise. [__USE_MISC]: Likewise. * resolv/netdb.h [__USE_GNU]: Likewise. * signal/signal.h: Update #endif comments. [__USE_MISC]: Remove redundant conditionals. * stdlib/stdlib.h: Update #else and #endif comments. [__USE_MISC]: Remove redundant conditionals. [__USE_GNU]: Likewise. * string/bits/string2.h [__USE_MISC]: Likewise. * string/string.h: Update #endif comments. [__USE_MISC]: Remove redundant conditionals. * sysdeps/m68k/m680x0/fpu/bits/mathinline.h [__USE_MISC]: Likewise. * sysdeps/mach/hurd/bits/fcntl.h [__USE_MISC]: Likewise. * sysdeps/mach/hurd/bits/stat.h [__USE_MISC]: Likewise. * sysdeps/unix/sysv/linux/alpha/bits/sigaction.h [__USE_MISC]: Likewise. * sysdeps/unix/sysv/linux/alpha/bits/stat.h [__USE_MISC]: Likewise. * sysdeps/unix/sysv/linux/bits/fcntl-linux.h: Update #endif comments. [__USE_MISC]: Remove redundant conditionals. * sysdeps/unix/sysv/linux/bits/in.h [__USE_GNU]: Likewise. * sysdeps/unix/sysv/linux/bits/sigaction.h [__USE_MISC]: Likewise. * sysdeps/unix/sysv/linux/bits/socket.h [__USE_GNU]: Likewise. * sysdeps/unix/sysv/linux/bits/stat.h [__USE_MISC]: Likewise. * sysdeps/unix/sysv/linux/ia64/bits/sigaction.h [__USE_MISC]: Likewise. * sysdeps/unix/sysv/linux/m68k/bits/stat.h [__USE_MISC]: Likewise. * sysdeps/unix/sysv/linux/mips/bits/sigaction.h [__USE_MISC]: Likewise. * sysdeps/unix/sysv/linux/mips/bits/stat.h [__USE_MISC]: Likewise. * sysdeps/unix/sysv/linux/powerpc/bits/stat.h [__USE_MISC]: Likewise. * sysdeps/unix/sysv/linux/s390/bits/sigaction.h [__USE_MISC]: Likewise. * sysdeps/unix/sysv/linux/s390/bits/stat.h [__USE_MISC]: Likewise. * sysdeps/unix/sysv/linux/sparc/bits/sigaction.h [__USE_MISC]: Likewise. * sysdeps/unix/sysv/linux/sparc/bits/stat.h [__USE_MISC]: Likewise. * sysdeps/unix/sysv/linux/x86/bits/stat.h [__USE_MISC]: Likewise. * sysdeps/x86/bits/string.h: Update #endif comments. * sysdeps/x86/fpu/bits/mathinline.h [__USE_MISC]: Remove redundant conditionals. * time/sys/time.h: Update #endif comments. * time/time.h: Likewise. [__USE_MISC]: Remove redundant conditionals.
186 lines
5.7 KiB
C
186 lines
5.7 KiB
C
/* Copyright (C) 1991-2014 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 Lesser General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2.1 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
|
|
Lesser General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
License along with the GNU C Library; if not, see
|
|
<http://www.gnu.org/licenses/>. */
|
|
|
|
/*
|
|
* POSIX Standard: 9.2.2 User Database Access <pwd.h>
|
|
*/
|
|
|
|
#ifndef _PWD_H
|
|
#define _PWD_H 1
|
|
|
|
#include <features.h>
|
|
|
|
__BEGIN_DECLS
|
|
|
|
#include <bits/types.h>
|
|
|
|
#define __need_size_t
|
|
#include <stddef.h>
|
|
|
|
#if defined __USE_XOPEN || defined __USE_XOPEN2K
|
|
/* The Single Unix specification says that some more types are
|
|
available here. */
|
|
# ifndef __gid_t_defined
|
|
typedef __gid_t gid_t;
|
|
# define __gid_t_defined
|
|
# endif
|
|
|
|
# ifndef __uid_t_defined
|
|
typedef __uid_t uid_t;
|
|
# define __uid_t_defined
|
|
# endif
|
|
#endif
|
|
|
|
/* The passwd structure. */
|
|
struct passwd
|
|
{
|
|
char *pw_name; /* Username. */
|
|
char *pw_passwd; /* Password. */
|
|
__uid_t pw_uid; /* User ID. */
|
|
__gid_t pw_gid; /* Group ID. */
|
|
char *pw_gecos; /* Real name. */
|
|
char *pw_dir; /* Home directory. */
|
|
char *pw_shell; /* Shell program. */
|
|
};
|
|
|
|
|
|
#ifdef __USE_MISC
|
|
# define __need_FILE
|
|
# include <stdio.h>
|
|
#endif
|
|
|
|
|
|
#if defined __USE_MISC || defined __USE_XOPEN_EXTENDED
|
|
/* Rewind the password-file stream.
|
|
|
|
This function is a possible cancellation point and therefore not
|
|
marked with __THROW. */
|
|
extern void setpwent (void);
|
|
|
|
/* Close the password-file stream.
|
|
|
|
This function is a possible cancellation point and therefore not
|
|
marked with __THROW. */
|
|
extern void endpwent (void);
|
|
|
|
/* Read an entry from the password-file stream, opening it if necessary.
|
|
|
|
This function is a possible cancellation point and therefore not
|
|
marked with __THROW. */
|
|
extern struct passwd *getpwent (void);
|
|
#endif
|
|
|
|
#ifdef __USE_MISC
|
|
/* Read an entry from STREAM.
|
|
|
|
This function is not part of POSIX and therefore no official
|
|
cancellation point. But due to similarity with an POSIX interface
|
|
or due to the implementation it is a cancellation point and
|
|
therefore not marked with __THROW. */
|
|
extern struct passwd *fgetpwent (FILE *__stream);
|
|
|
|
/* Write the given entry onto the given stream.
|
|
|
|
This function is not part of POSIX and therefore no official
|
|
cancellation point. But due to similarity with an POSIX interface
|
|
or due to the implementation it is a cancellation point and
|
|
therefore not marked with __THROW. */
|
|
extern int putpwent (const struct passwd *__restrict __p,
|
|
FILE *__restrict __f);
|
|
#endif
|
|
|
|
/* Search for an entry with a matching user ID.
|
|
|
|
This function is a possible cancellation point and therefore not
|
|
marked with __THROW. */
|
|
extern struct passwd *getpwuid (__uid_t __uid);
|
|
|
|
/* Search for an entry with a matching username.
|
|
|
|
This function is a possible cancellation point and therefore not
|
|
marked with __THROW. */
|
|
extern struct passwd *getpwnam (const char *__name);
|
|
|
|
#ifdef __USE_POSIX
|
|
|
|
# ifdef __USE_MISC
|
|
/* Reasonable value for the buffer sized used in the reentrant
|
|
functions below. But better use `sysconf'. */
|
|
# define NSS_BUFLEN_PASSWD 1024
|
|
# endif
|
|
|
|
/* Reentrant versions of some of the functions above.
|
|
|
|
PLEASE NOTE: the `getpwent_r' function is not (yet) standardized.
|
|
The interface may change in later versions of this library. But
|
|
the interface is designed following the principals used for the
|
|
other reentrant functions so the chances are good this is what the
|
|
POSIX people would choose. */
|
|
|
|
# ifdef __USE_MISC
|
|
/* This function is not part of POSIX and therefore no official
|
|
cancellation point. But due to similarity with an POSIX interface
|
|
or due to the implementation it is a cancellation point and
|
|
therefore not marked with __THROW. */
|
|
extern int getpwent_r (struct passwd *__restrict __resultbuf,
|
|
char *__restrict __buffer, size_t __buflen,
|
|
struct passwd **__restrict __result);
|
|
# endif
|
|
|
|
extern int getpwuid_r (__uid_t __uid,
|
|
struct passwd *__restrict __resultbuf,
|
|
char *__restrict __buffer, size_t __buflen,
|
|
struct passwd **__restrict __result);
|
|
|
|
extern int getpwnam_r (const char *__restrict __name,
|
|
struct passwd *__restrict __resultbuf,
|
|
char *__restrict __buffer, size_t __buflen,
|
|
struct passwd **__restrict __result);
|
|
|
|
|
|
# ifdef __USE_MISC
|
|
/* Read an entry from STREAM. This function is not standardized and
|
|
probably never will.
|
|
|
|
This function is not part of POSIX and therefore no official
|
|
cancellation point. But due to similarity with an POSIX interface
|
|
or due to the implementation it is a cancellation point and
|
|
therefore not marked with __THROW. */
|
|
extern int fgetpwent_r (FILE *__restrict __stream,
|
|
struct passwd *__restrict __resultbuf,
|
|
char *__restrict __buffer, size_t __buflen,
|
|
struct passwd **__restrict __result);
|
|
# endif
|
|
|
|
#endif /* POSIX or reentrant */
|
|
|
|
#ifdef __USE_GNU
|
|
/* Re-construct the password-file line for the given uid
|
|
in the given buffer. This knows the format that the caller
|
|
will expect, but this need not be the format of the password file.
|
|
|
|
This function is not part of POSIX and therefore no official
|
|
cancellation point. But due to similarity with an POSIX interface
|
|
or due to the implementation it is a cancellation point and
|
|
therefore not marked with __THROW. */
|
|
extern int getpw (__uid_t __uid, char *__buffer);
|
|
#endif
|
|
|
|
__END_DECLS
|
|
|
|
#endif /* pwd.h */
|