Changeset 2725 in MondoRescue for branches/2.2.9/mindi-busybox/include/pwd_.h


Ignore:
Timestamp:
Feb 25, 2011, 9:26:54 PM (13 years ago)
Author:
Bruno Cornec
Message:
  • Update mindi-busybox to 1.18.3 to avoid problems with the tar command which is now failing on recent versions with busybox 1.7.3
File:
1 edited

Legend:

Unmodified
Added
Removed

  • branches/2.2.9/mindi-busybox/include/pwd_.h

    r1765 r2725  
    1919
    2020/*
    21  *  POSIX Standard: 9.2.2 User Database Access  <pwd.h>
     21 * POSIX Standard: 9.2.2 User Database Access   <pwd.h>
    2222 */
    2323
    24 #if !ENABLE_USE_BB_PWD_GRP
     24#ifndef BB_PWD_H
     25#define BB_PWD_H 1
    2526
    26 #include <pwd.h>
     27PUSH_AND_SET_FUNCTION_VISIBILITY_TO_HIDDEN
    2728
    28 #else
    29 
    30 #ifndef _PWD_H
    31 #define _PWD_H 1
    32 
    33 /* The passwd structure.  */
    34 struct passwd {
    35     char *pw_name;          /* Username.  */
    36     char *pw_passwd;        /* Password.  */
    37     uid_t pw_uid;           /* User ID.  */
    38     gid_t pw_gid;           /* Group ID.  */
    39     char *pw_gecos;         /* Real name.  */
    40     char *pw_dir;           /* Home directory.  */
    41     char *pw_shell;         /* Shell program.  */
    42 };
    43 
     29/* This file is #included after #include <pwd.h>
     30 * We will use libc-defined structures, but will #define function names
     31 * so that function calls are directed to bb_internal_XXX replacements
     32 */
    4433
    4534#define setpwent    bb_internal_setpwent
    … …  
    5443#define getpwnam_r  bb_internal_getpwnam_r
    5544#define fgetpwent_r bb_internal_fgetpwent_r
    56 #define getpw       bb_internal_getpw
    5745
    5846
    5947/* All function names below should be remapped by #defines above
    60  * in order to not collide with libc names.
    61  * In theory it isn't necessary, but I saw weird interactions at link time.
    62  * Let's play safe */
     48 * in order to not collide with libc names. */
    6349
    6450
    … …  
    6955extern void endpwent(void);
    7056
     57#ifdef UNUSED_SINCE_WE_AVOID_STATIC_BUFS
    7158/* Read an entry from the password-file stream, opening it if necessary.  */
    7259extern struct passwd *getpwent(void);
    … …  
    7663
    7764/* Write the given entry onto the given stream.  */
    78 extern int putpwent(__const struct passwd *__restrict __p,
     65extern int putpwent(const struct passwd *__restrict __p,
    7966             FILE *__restrict __f);
     67#endif
    8068
    8169/* Search for an entry with a matching user ID.  */
    … …  
    8371
    8472/* Search for an entry with a matching username.  */
    85 extern struct passwd *getpwnam(__const char *__name);
     73extern struct passwd *getpwnam(const char *__name);
    8674
    8775/* Reentrant versions of some of the functions above.
    … …  
    10290               struct passwd **__restrict __result);
    10391
    104 extern int getpwnam_r(__const char *__restrict __name,
     92extern int getpwnam_r(const char *__restrict __name,
    10593               struct passwd *__restrict __resultbuf,
    10694               char *__restrict __buffer, size_t __buflen,
    … …  
    114102            struct passwd **__restrict __result);
    115103
    116 /* Re-construct the password-file line for the given uid
    117    in the given buffer.  This knows the format that the caller
    118    will expect, but this need not be the format of the password file.  */
    119 extern int getpw(uid_t __uid, char *__buffer);
     104POP_SAVED_FUNCTION_VISIBILITY
    120105
    121 #endif /* pwd.h  */
    122106#endif
Note: See TracChangeset for help on using the changeset viewer.