rename __getgrent so that it doesn't conflict with some libc's

diff --git a/include/grp_.h b/include/grp_.h
index 0ce274cf0857d86593608db55bf788e1400a7ee8..7cb0d4af6f676d9617009acbda43196c8520f94b 100644 (file)
--- a/include/grp_.h
+++ b/include/grp_.h
@@ -32,7 +32,7 @@ extern struct group * fgetgrent __P ((FILE * file));
 extern int setgroups __P ((size_t n, __const gid_t * groups));
 extern int initgroups __P ((__const char * user, gid_t gid));
 
-extern struct group * __getgrent __P ((int grp_fd));
+extern struct group * bb_getgrent __P ((int grp_fd));
 
 #endif /* USE_SYSTEM_PWD_GRP */
 #endif /* __CONFIG_GRP_H */

diff --git a/libpwdgrp/__getgrent.c b/libpwdgrp/__getgrent.c
index 39230104879b5b730859ca78f20000cb2a230408..a20b3a260b69317744965a9592cd039139bdfa76 100644 (file)
--- a/libpwdgrp/__getgrent.c
+++ b/libpwdgrp/__getgrent.c
@@ -71,7 +71,7 @@
  * getgrent() except that it is passed a file descriptor.  getgrent()
  * is just a wrapper for this function.
  */
-struct group *__getgrent(int grp_fd)
+struct group *bb_getgrent(int grp_fd)
 {
 #ifndef GR_SCALE_DYNAMIC
        static char line_buff[GR_MAX_LINE_LEN];

diff --git a/libpwdgrp/fgetgrent.c b/libpwdgrp/fgetgrent.c
index 1492a1a9546150d28cc8fdd52379768b24ed336c..da4ca053fa271daa78c954593bd7a43e1d54a910 100644 (file)
--- a/libpwdgrp/fgetgrent.c
+++ b/libpwdgrp/fgetgrent.c
@@ -31,5 +31,5 @@ struct group *fgetgrent(FILE * file)
                return NULL;
        }
 
-       return __getgrent(fileno(file));
+       return bb_getgrent(fileno(file));
 }

diff --git a/libpwdgrp/getgrgid.c b/libpwdgrp/getgrgid.c
index 7ffe8c5c319289ca046e2e5a5a10b3a5997f1c32..0f5ce1cac0ed9ffc1d87d4541aba59f7fb73cafc 100644 (file)
--- a/libpwdgrp/getgrgid.c
+++ b/libpwdgrp/getgrgid.c
@@ -33,7 +33,7 @@ struct group *getgrgid(const gid_t gid)
        if ((grp_fd = open(bb_path_group_file, O_RDONLY)) < 0)
                return NULL;
 
-       while ((group = __getgrent(grp_fd)) != NULL)
+       while ((group = bb_getgrent(grp_fd)) != NULL)
                if (group->gr_gid == gid) {
                        close(grp_fd);
                        return group;

diff --git a/libpwdgrp/getgrnam.c b/libpwdgrp/getgrnam.c
index bf7f7646d6fe284ac3c86e5d935f61e6de403e4a..46950e2b6da4e3850bd43c2053cd13f4c9fc5be6 100644 (file)
--- a/libpwdgrp/getgrnam.c
+++ b/libpwdgrp/getgrnam.c
@@ -39,7 +39,7 @@ struct group *getgrnam(const char *name)
        if ((grp_fd = open(bb_path_group_file, O_RDONLY)) < 0)
                return NULL;
 
-       while ((group = __getgrent(grp_fd)) != NULL)
+       while ((group = bb_getgrent(grp_fd)) != NULL)
                if (!strcmp(group->gr_name, name)) {
                        close(grp_fd);
                        return group;

diff --git a/libpwdgrp/grent.c b/libpwdgrp/grent.c
index 609ed1a46bdf361f1d1ab7c31e125bd2be35a73f..ff3c49e68057e773fc1e83f9fb1c894b435494ec 100644 (file)
--- a/libpwdgrp/grent.c
+++ b/libpwdgrp/grent.c
@@ -50,5 +50,5 @@ struct group *getgrent(void)
 {
        if (grp_fd == -1)
                return NULL;
-       return __getgrent(grp_fd);
+       return bb_getgrent(grp_fd);
 }

diff --git a/libpwdgrp/initgroups.c b/libpwdgrp/initgroups.c
index ce63adb1826bf041d02009ab036e3bb0f63ccf3f..f979483796c0ce62511a839634580cf78effc927 100644 (file)
--- a/libpwdgrp/initgroups.c
+++ b/libpwdgrp/initgroups.c
@@ -89,9 +89,9 @@ int initgroups(__const char *user, gid_t gid)
        group_list[num_groups] = gid;
 #ifndef GR_DYNAMIC_GROUP_LIST
        while (num_groups < GR_MAX_GROUPS &&
-                  (group = __getgrent(grp_fd)) != NULL)
+                  (group = bb_getgrent(grp_fd)) != NULL)
 #else
-       while ((group = __getgrent(grp_fd)) != NULL)
+       while ((group = bb_getgrent(grp_fd)) != NULL)
 #endif
        {
                if (group->gr_gid != gid)