mirror of
https://sourceware.org/git/glibc.git
synced 2025-08-01 10:06:57 +03:00
Update for 960809.
Fri Aug 9 17:38:58 1996 Ulrich Drepper <drepper@cygnus.com> * sysdeps/unix/sysv/linux/sys/timex.h: Include <sys/time.h> to get `struct timeval'. * sysdeps/unix/sysv/linux/sys/acct.h: Get time_t from <time.h>. * sysdeps/unix/sysv/linux/sys/module.h: Get size_t from <stddef.h>. * sysdeps/unix/sysv/linux/sys/io.h: Get definition of __P. * sysdeps/unix/sysv/linux/sys/klog.h: Likewise. * gmon/sys/gmon.h: Include <sys/types.h> to get u_long. * sysdeps/unix/sysv/linux/direntry.h: Complete types in <linux/dirent.h>. * io/fts.h: Include <sys/types.h> to get dev_t. Reported by Matthias Urlichs. * sysdeps/posix/tempname.c [USE_IN_LIBIO]: Don't clear _IO_file_flags. It's the same as _flags. Reported by Miquel van Smoorenburg <miquels@Q.cistron.nl>. Wed Aug 7 19:38:47 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/unix/sysv/linux/m68k/resourcebits.h: Add RLIMIT_AS.
This commit is contained in:
@ -23,6 +23,6 @@ subdir := pwd
|
||||
|
||||
routines := fgetpwent getpw putpwent \
|
||||
getpwent getpwnam getpwuid \
|
||||
getpwent_r getpwnam_r getpwuid_r
|
||||
getpwent_r getpwnam_r getpwuid_r fgetpwent_r
|
||||
|
||||
include ../Rules
|
||||
|
@ -16,27 +16,8 @@ License along with the GNU C Library; see the file COPYING.LIB. If
|
||||
not, write to the Free Software Foundation, Inc., 675 Mass Ave,
|
||||
Cambridge, MA 02139, USA. */
|
||||
|
||||
#include <stdio.h>
|
||||
#include <pwd.h>
|
||||
|
||||
/* Define a line parsing function using the common code
|
||||
used in the nss_files module. */
|
||||
|
||||
#define STRUCTURE passwd
|
||||
#define ENTNAME pwent
|
||||
struct pwent_data {};
|
||||
|
||||
#include "../nss/nss_files/files-parse.c"
|
||||
LINE_PARSER
|
||||
(,
|
||||
STRING_FIELD (result->pw_name, ISCOLON, 0);
|
||||
STRING_FIELD (result->pw_passwd, ISCOLON, 0);
|
||||
INT_FIELD (result->pw_uid, ISCOLON, 0, 10,);
|
||||
INT_FIELD (result->pw_gid, ISCOLON, 0, 10,);
|
||||
STRING_FIELD (result->pw_gecos, ISCOLON, 0);
|
||||
STRING_FIELD (result->pw_dir, ISCOLON, 0);
|
||||
result->pw_shell = line;
|
||||
)
|
||||
#include <stdio.h>
|
||||
|
||||
|
||||
/* Read one entry from the given stream. */
|
||||
@ -45,21 +26,6 @@ fgetpwent (FILE *stream)
|
||||
{
|
||||
static char buffer[BUFSIZ];
|
||||
static struct passwd result;
|
||||
char *p;
|
||||
|
||||
do
|
||||
{
|
||||
p = fgets (buffer, sizeof buffer, stream);
|
||||
if (p == NULL)
|
||||
return NULL;
|
||||
|
||||
/* Skip leading blanks. */
|
||||
while (isspace (*p))
|
||||
++p;
|
||||
} 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 (p, &result, (void *) buffer, sizeof buffer));
|
||||
|
||||
return &result;
|
||||
return __fgetpwent_r (stream, &result, buffer, sizeof buffer);
|
||||
}
|
||||
|
@ -25,6 +25,6 @@ Boston, MA 02111-1307, USA. */
|
||||
#define GETFUNC_NAME getpwent
|
||||
#define ENDFUNC_NAME endpwent
|
||||
#define DATABASE_NAME passwd
|
||||
#define BUFLEN 1024
|
||||
#define BUFLEN NSS_BUFLEN_PASSWD
|
||||
|
||||
#include "../nss/getXXent.c"
|
||||
|
@ -8,7 +8,7 @@ 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
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of/tes
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
Library General Public License for more details.
|
||||
|
||||
@ -25,6 +25,6 @@ Boston, MA 02111-1307, USA. */
|
||||
#define GETFUNC_NAME getpwent
|
||||
#define ENDFUNC_NAME endpwent
|
||||
#define DATABASE_NAME passwd
|
||||
#define BUFLEN 1024
|
||||
#define BUFLEN NSS_BUFLEN_PASSWD
|
||||
|
||||
#include "../nss/getXXent_r.c"
|
||||
|
@ -25,6 +25,6 @@ Boston, MA 02111-1307, USA. */
|
||||
#define DATABASE_NAME passwd
|
||||
#define ADD_PARAMS const char *name
|
||||
#define ADD_VARIABLES name
|
||||
#define BUFLEN 1024
|
||||
#define BUFLEN NSS_BUFLEN_PASSWD
|
||||
|
||||
#include "../nss/getXXbyYY.c"
|
||||
|
@ -25,6 +25,6 @@ Boston, MA 02111-1307, USA. */
|
||||
#define DATABASE_NAME passwd
|
||||
#define ADD_PARAMS const char *name
|
||||
#define ADD_VARIABLES name
|
||||
#define BUFLEN 1024
|
||||
#define BUFLEN NSS_BUFLEN_PASSWD
|
||||
|
||||
#include "../nss/getXXbyYY_r.c"
|
||||
|
@ -25,6 +25,6 @@ Boston, MA 02111-1307, USA. */
|
||||
#define DATABASE_NAME passwd
|
||||
#define ADD_PARAMS uid_t uid
|
||||
#define ADD_VARIABLES uid
|
||||
#define BUFLEN 1024
|
||||
#define BUFLEN NSS_BUFLEN_PASSWD
|
||||
|
||||
#include "../nss/getXXbyYY.c"
|
||||
|
@ -25,6 +25,6 @@ Boston, MA 02111-1307, USA. */
|
||||
#define DATABASE_NAME passwd
|
||||
#define ADD_PARAMS uid_t uid
|
||||
#define ADD_VARIABLES uid
|
||||
#define BUFLEN 1024
|
||||
#define BUFLEN NSS_BUFLEN_PASSWD
|
||||
|
||||
#include "../nss/getXXbyYY_r.c"
|
||||
|
11
pwd/pwd.h
11
pwd/pwd.h
@ -123,6 +123,17 @@ extern struct passwd *getpwnam_r __P ((__const char *__name,
|
||||
struct passwd *__resultbuf,
|
||||
char *__buffer, int __buflen));
|
||||
|
||||
|
||||
#ifdef __USE_SVID
|
||||
/* Read an entry from STREAM. */
|
||||
extern struct passwd *__fgetpwent_r __P ((FILE * __stream,
|
||||
struct passwd *__resultbuf,
|
||||
char *__buffer, int __buflen));
|
||||
extern struct passwd *fgetpwent_r __P ((FILE * __stream,
|
||||
struct passwd *__resultbuf,
|
||||
char *__buffer, int __buflen));
|
||||
#endif
|
||||
|
||||
#endif /* reentrant */
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user