X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=include%2Fgrp_.h;h=3d00b4aa7c26fa058cb1d99fbc29172691c81fb6;hb=dc4178050a9e150d26fe7041191a5d124fcdf03c;hp=3ac5c8461936bf2d924e9a9c906ffe92ecd78c92;hpb=63fc1a9e08fabfc8ba96bad80731673ef40bf5cb;p=oweals%2Fbusybox.git

diff --git a/include/grp_.h b/include/grp_.h
index 3ac5c8461..3d00b4aa7 100644
--- a/include/grp_.h
+++ b/include/grp_.h
@@ -21,52 +21,58 @@
  *	POSIX Standard: 9.2.1 Group Database Access	<grp.h>
  */
 
+#ifndef	BB_GRP_H
+#define	BB_GRP_H 1
 
-#if !defined CONFIG_USE_BB_PWD_GRP
-#include <grp.h>
-
-#else
-
-#ifndef	_GRP_H
-#define	_GRP_H	1
+#if __GNUC_PREREQ(4,1)
+# pragma GCC visibility push(hidden)
+#endif
 
+/* This file is #included after #include <grp.h>
+ * We will use libc-defined structures, but will #define function names
+ * so that function calls are directed to bb_internal_XXX replacements
+ */
 
-#include <sys/types.h>
-#include <features.h>
-#include <stdio.h>
+#define setgrent     bb_internal_setgrent
+#define endgrent     bb_internal_endgrent
+#define getgrent     bb_internal_getgrent
+#define fgetgrent    bb_internal_fgetgrent
+#define putgrent     bb_internal_putgrent
+#define getgrgid     bb_internal_getgrgid
+#define getgrnam     bb_internal_getgrnam
+#define getgrent_r   bb_internal_getgrent_r
+#define getgrgid_r   bb_internal_getgrgid_r
+#define getgrnam_r   bb_internal_getgrnam_r
+#define fgetgrent_r  bb_internal_fgetgrent_r
+#define getgrouplist bb_internal_getgrouplist
+#define initgroups   bb_internal_initgroups
 
 
-/* The group structure.	 */
-struct group
-{
-    char *gr_name;		/* Group name.	*/
-    char *gr_passwd;		/* Password.	*/
-    gid_t gr_gid;		/* Group ID.	*/
-    char **gr_mem;		/* Member list.	*/
-};
+/* All function names below should be remapped by #defines above
+ * in order to not collide with libc names. */
 
 
 /* Rewind the group-file stream.  */
-extern void setgrent (void);
+extern void setgrent(void);
 
 /* Close the group-file stream.  */
-extern void endgrent (void);
+extern void endgrent(void);
 
 /* Read an entry from the group-file stream, opening it if necessary.  */
-extern struct group *getgrent (void);
+extern struct group *getgrent(void);
 
 /* Read a group entry from STREAM.  */
-extern struct group *fgetgrent (FILE *__stream);
+extern struct group *fgetgrent(FILE *__stream);
 
 /* Write the given entry onto the given stream.  */
-extern int putgrent (__const struct group *__restrict __p,
+extern int putgrent(const struct group *__restrict __p,
 		     FILE *__restrict __f);
 
 /* Search for an entry with a matching group ID.  */
-extern struct group *getgrgid (gid_t __gid);
+extern struct group *getgrgid(gid_t __gid);
 
 /* Search for an entry with a matching group name.  */
-extern struct group *getgrnam (__const char *__name);
+extern struct group *getgrnam(const char *__name);
 
 /* Reentrant versions of some of the functions above.
 
@@ -76,42 +82,41 @@ extern struct group *getgrnam (__const char *__name);
    other reentrant functions so the chances are good this is what the
    POSIX people would choose.  */
 
-extern int getgrent_r (struct group *__restrict __resultbuf,
+extern int getgrent_r(struct group *__restrict __resultbuf,
 		       char *__restrict __buffer, size_t __buflen,
 		       struct group **__restrict __result);
 
 /* Search for an entry with a matching group ID.  */
-extern int getgrgid_r (gid_t __gid, struct group *__restrict __resultbuf,
+extern int getgrgid_r(gid_t __gid, struct group *__restrict __resultbuf,
 		       char *__restrict __buffer, size_t __buflen,
 		       struct group **__restrict __result);
 
 /* Search for an entry with a matching group name.  */
-extern int getgrnam_r (__const char *__restrict __name,
+extern int getgrnam_r(const char *__restrict __name,
 		       struct group *__restrict __resultbuf,
 		       char *__restrict __buffer, size_t __buflen,
 		       struct group **__restrict __result);
 
 /* Read a group entry from STREAM.  This function is not standardized
    an probably never will.  */
-extern int fgetgrent_r (FILE *__restrict __stream,
+extern int fgetgrent_r(FILE *__restrict __stream,
 			struct group *__restrict __resultbuf,
 			char *__restrict __buffer, size_t __buflen,
 			struct group **__restrict __result);
 
-/* Set the group set for the current user to GROUPS (N of them).  */
-extern int setgroups (size_t __n, __const gid_t *__groups);
-
 /* Store at most *NGROUPS members of the group set for USER into
    *GROUPS.  Also include GROUP.  The actual number of groups found is
    returned in *NGROUPS.  Return -1 if the if *NGROUPS is too small.  */
-extern int getgrouplist (__const char *__user, gid_t __group,
+extern int getgrouplist(const char *__user, gid_t __group,
 			 gid_t *__groups, int *__ngroups);
 
 /* Initialize the group set for the current user
    by reading the group database and using all groups
    of which USER is a member.  Also include GROUP.  */
-extern int initgroups (__const char *__user, gid_t __group);
+extern int initgroups(const char *__user, gid_t __group);
 
+#if __GNUC_PREREQ(4,1)
+# pragma GCC visibility pop
+#endif
 
-#endif /* grp.h  */
 #endif