Changeset 3621 in MondoRescue for branches/3.3/mindi-busybox/include/pwd_.h

Timestamp:

Dec 20, 2016, 4:07:32 PM (7 years ago)

Author:

Bruno Cornec

Message:

New 3?3 banch for incorporation of latest busybox 1.25. Changing minor version to handle potential incompatibilities.

Location:

branches/3.3

Files:

• . (copied) (copied from branches/3.2 )
• mindi-busybox/include/pwd_.h (modified) (1 diff)

branches/3.3/mindi-busybox/include/pwd_.h

@@ -35 +35 @@
 #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
-
 
 /* 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);
+void FAST_FUNC setpwent(void);
 
 /* Close the password-file stream.  */
-extern void endpwent(void);
+void FAST_FUNC endpwent(void);
 
-#ifdef UNUSED_SINCE_WE_AVOID_STATIC_BUFS
 /* 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);
-#endif
+struct passwd* FAST_FUNC getpwent(void);
 
 /* Search for an entry with a matching user ID.  */
-extern struct passwd *getpwuid(uid_t __uid);
+struct passwd* FAST_FUNC getpwuid(uid_t __uid);
 
 /* Search for an entry with a matching username.  */
-extern struct passwd *getpwnam(const char *__name);
+struct passwd* FAST_FUNC 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,
+/* Reentrant versions of some of the functions above. */
+int FAST_FUNC getpwnam_r(const char *__restrict __name,
         struct passwd *__restrict __resultbuf,
         char *__restrict __buffer, size_t __buflen,