From 4aca87515a5083ae0e31ce3177189fd43b6d05ac Mon Sep 17 00:00:00 2001 From: Andreas Baumann Date: Sat, 3 Jan 2015 13:58:15 +0100 Subject: patch to Vanilla Tomato 1.28 --- release/src/router/busybox/include/pwd_.h | 129 +++++++++++++++++++++++------- 1 file changed, 99 insertions(+), 30 deletions(-) (limited to 'release/src/router/busybox/include/pwd_.h') diff --git a/release/src/router/busybox/include/pwd_.h b/release/src/router/busybox/include/pwd_.h index 3f081e87..f52445ce 100644 --- a/release/src/router/busybox/include/pwd_.h +++ b/release/src/router/busybox/include/pwd_.h @@ -1,41 +1,110 @@ -#ifndef __CONFIG_PWD_H -#define __CONFIG_PWD_H +/* vi: set sw=4 ts=4: */ +/* Copyright (C) 1991,92,95,96,97,98,99,2001 Free Software Foundation, Inc. + This file is part of the GNU C Library. -#if !defined CONFIG_USE_BB_PWD_GRP -#include + 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. -#else + 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. -#include -#include -#include + 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. */ -/* 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. */ -}; +/* + * POSIX Standard: 9.2.2 User Database Access + */ -extern void setpwent __P ((void)); -extern void endpwent __P ((void)); -extern struct passwd * getpwent __P ((void)); +#ifndef BB_PWD_H +#define BB_PWD_H 1 -extern int putpwent __P ((__const struct passwd * __p, FILE * __f)); -extern int getpw __P ((uid_t uid, char *buf)); +PUSH_AND_SET_FUNCTION_VISIBILITY_TO_HIDDEN -extern struct passwd * fgetpwent __P ((FILE * file)); +/* This file is #included after #include + * We will use libc-defined structures, but will #define function names + * so that function calls are directed to bb_internal_XXX replacements + */ -extern struct passwd * getpwuid __P ((__const uid_t)); -extern struct passwd * getpwnam __P ((__const char *)); +#define setpwent bb_internal_setpwent +#define endpwent bb_internal_endpwent +#define getpwent bb_internal_getpwent +#define fgetpwent bb_internal_fgetpwent +#define putpwent bb_internal_putpwent +#define getpwuid bb_internal_getpwuid +#define getpwnam bb_internal_getpwnam +#define getpwent_r bb_internal_getpwent_r +#define getpwuid_r bb_internal_getpwuid_r +#define getpwnam_r bb_internal_getpwnam_r +#define fgetpwent_r bb_internal_fgetpwent_r +//#define getpw bb_internal_getpw -extern struct passwd * __getpwent __P ((__const int passwd_fd)); -#endif /* USE_SYSTEM_PWD_GRP */ -#endif /* __CONFIG_PWD_H */ +/* All function names below should be remapped by #defines above + * in order to not collide with libc names. */ + +/* Rewind the password-file stream. */ +extern void setpwent(void); + +/* Close the password-file stream. */ +extern void endpwent(void); + +/* Read an entry from the password-file stream, opening it if necessary. */ +extern struct passwd *getpwent(void); + +/* Read an entry from STREAM. */ +extern struct passwd *fgetpwent(FILE *__stream); + +/* Write the given entry onto the given stream. */ +extern int putpwent(const struct passwd *__restrict __p, + FILE *__restrict __f); + +/* Search for an entry with a matching user ID. */ +extern struct passwd *getpwuid(uid_t __uid); + +/* Search for an entry with a matching username. */ +extern struct passwd *getpwnam(const char *__name); + +/* 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. */ + +extern int getpwent_r(struct passwd *__restrict __resultbuf, + char *__restrict __buffer, size_t __buflen, + struct passwd **__restrict __result); + +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); + +/* 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); + +/* 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. */ +/* UNUSED extern int getpw(uid_t __uid, char *__buffer); */ + +POP_SAVED_FUNCTION_VISIBILITY + +#endif /* pwd.h */ -- cgit v1.2.3-54-g00ecf