From f796700cf010d7ff2615c59bc364bbbef14153a4 Mon Sep 17 00:00:00 2001
From: Russ Dill
Date: Thu, 18 Dec 2003 22:40:58 +0000
Subject: rename __getgrent so that it doesn't conflict with some libc's

---
 libpwdgrp/__getgrent.c | 2 +-
 libpwdgrp/fgetgrent.c  | 2 +-
 libpwdgrp/getgrgid.c   | 2 +-
 libpwdgrp/getgrnam.c   | 2 +-
 libpwdgrp/grent.c      | 2 +-
 libpwdgrp/initgroups.c | 4 ++--
 6 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'libpwdgrp')

diff --git a/libpwdgrp/__getgrent.c b/libpwdgrp/__getgrent.c
index 3923010..a20b3a2 100644
--- 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 1492a1a..da4ca05 100644
--- 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 7ffe8c5..0f5ce1c 100644
--- 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 bf7f764..46950e2 100644
--- 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 609ed1a..ff3c49e 100644
--- 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 ce63adb..f979483 100644
--- 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)
-- 
cgit v1.1