Rev all the header files to sync things with glibc 2.2.4

1 files changed, 120 insertions, 36 deletions

diff --git a/include/pwd.h b/include/pwd.h
index 3377afd88..8a54578b8 100644
--- a/include/pwd.h
+++ b/include/pwd.h
@@ -1,63 +1,147 @@
-#ifndef	__PWD_H
-#define	__PWD_H
+/* Copyright (C) 1991,92,95,96,97,98,99,2001 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, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+/*
+ *	POSIX Standard: 9.2.2 User Database Access	<pwd.h>
+ */
+
+#ifndef	_PWD_H
+#define	_PWD_H	1
 
-#include <sys/types.h>
 #include <features.h>
-#include <stdio.h>
 
 __BEGIN_DECLS
 
+#include <bits/types.h>
+
+#define __need_size_t
+#include <stddef.h>
+
+#ifdef __USE_XOPEN
+/* 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.  */
+  __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.  */
 };
 
 
-extern void setpwent __P ((void));
-extern void endpwent __P ((void));
-extern struct passwd * getpwent __P ((void));
+#if defined __USE_SVID || defined __USE_GNU
+# define __need_FILE
+# include <stdio.h>
+#endif
+
 
-extern int putpwent __P ((const struct passwd * __p, FILE * __f));
-extern int getpw __P ((uid_t uid, char *buf));
+#if defined __USE_SVID || defined __USE_MISC || defined __USE_XOPEN_EXTENDED
+/* Rewind the password-file stream.  */
+extern void setpwent (void) __THROW;
 
-extern struct passwd * fgetpwent __P ((FILE * file));
+/* Close the password-file stream.  */
+extern void endpwent (void) __THROW;
 
-extern struct passwd * getpwuid __P ((const uid_t));
-extern struct passwd * getpwnam __P ((const char *));
+/* Read an entry from the password-file stream, opening it if necessary.  */
+extern struct passwd *getpwent (void) __THROW;
+#endif
 
+#ifdef	__USE_SVID
+/* Read an entry from STREAM.  */
+extern struct passwd *fgetpwent (FILE *__stream) __THROW;
 
-extern int getpwent_r __P ((struct passwd *__restrict __resultbuf,
-			    char *__restrict __buffer, size_t __buflen,
-			    struct passwd **__restrict __result));
-extern int getpwuid_r __P ((uid_t __uid,
-			    struct passwd *__restrict __resultbuf,
-			    char *__restrict __buffer, size_t __buflen,
-			    struct passwd **__restrict __result));
-extern int getpwnam_r __P ((const char *__restrict __name,
-			    struct passwd *__restrict __resultbuf,
-			    char *__restrict __buffer, size_t __buflen,
-			    struct passwd **__restrict __result));
-extern int fgetpwent_r __P ((FILE *__restrict __stream,
-			     struct passwd *__restrict __resultbuf,
-			     char *__restrict __buffer, size_t __buflen,
-			     struct passwd **__restrict __result));
+/* Write the given entry onto the given stream.  */
+extern int putpwent (__const struct passwd *__restrict __p,
+		     FILE *__restrict __f) __THROW;
+#endif
 
-#ifdef _LIBC
-/* This is used internally to uClibc */
-extern int __getpwent_r(struct passwd * passwd, char * line_buff, 
-	size_t buflen, int pwd_fd);
+/* Search for an entry with a matching user ID.  */
+extern struct passwd *getpwuid (__uid_t __uid) __THROW;
+
+/* Search for an entry with a matching username.  */
+extern struct passwd *getpwnam (__const char *__name) __THROW;
+
+#if defined __USE_POSIX || defined __USE_MISC
+
+# 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.  */
+
+# if defined __USE_SVID || defined __USE_MISC
+extern int getpwent_r (struct passwd *__restrict __resultbuf,
+		       char *__restrict __buffer, size_t __buflen,
+		       struct passwd **__restrict __result) __THROW;
+# endif
+
+extern int getpwuid_r (__uid_t __uid,
+		       struct passwd *__restrict __resultbuf,
+		       char *__restrict __buffer, size_t __buflen,
+		       struct passwd **__restrict __result) __THROW;
+
+extern int getpwnam_r (__const char *__restrict __name,
+		       struct passwd *__restrict __resultbuf,
+		       char *__restrict __buffer, size_t __buflen,
+		       struct passwd **__restrict __result) __THROW;
+
+
+# ifdef	__USE_SVID
+/* Read an entry from STREAM.  This function is not standardized and
+   probably never will.  */
+extern int fgetpwent_r (FILE *__restrict __stream,
+			struct passwd *__restrict __resultbuf,
+			char *__restrict __buffer, size_t __buflen,
+			struct passwd **__restrict __result) __THROW;
+# 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.  */
+extern int getpw (__uid_t __uid, char *__buffer) __THROW;
 #endif
 
 __END_DECLS
 
 #endif /* pwd.h  */
-
-
-