[BusyBox-cvs] busybox/libpwdgrp __getgrent.c, 1.4, 1.5 fgetgrent.c, 1.2, 1.3 getgrgid.c, 1.3, 1.4 getgrnam.c, 1.3, 1.4 grent.c, 1.3, 1.4 initgroups.c, 1.5, 1.6

[Russ Dill]

Update of /var/cvs/busybox/libpwdgrp
In directory nail:/tmp/cvs-serv12564/libpwdgrp

Modified Files:
	__getgrent.c fgetgrent.c getgrgid.c getgrnam.c grent.c 
	initgroups.c 
Log Message:
rename __getgrent so that it doesn't conflict with some libc's

Index: getgrgid.c
===================================================================
RCS file: /var/cvs/busybox/libpwdgrp/getgrgid.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- getgrgid.c	26 Jul 2003 07:48:13 -0000	1.3
+++ getgrgid.c	18 Dec 2003 22:40:58 -0000	1.4
@@ -33,7 +33,7 @@
 	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;

Index: grent.c
===================================================================
RCS file: /var/cvs/busybox/libpwdgrp/grent.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- grent.c	26 Jul 2003 07:48:13 -0000	1.3
+++ grent.c	18 Dec 2003 22:40:58 -0000	1.4
@@ -50,5 +50,5 @@
 {
 	if (grp_fd == -1)
 		return NULL;
-	return __getgrent(grp_fd);
+	return bb_getgrent(grp_fd);
 }

Index: fgetgrent.c
===================================================================
RCS file: /var/cvs/busybox/libpwdgrp/fgetgrent.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- fgetgrent.c	3 Jul 2002 23:19:15 -0000	1.2
+++ fgetgrent.c	18 Dec 2003 22:40:58 -0000	1.3
@@ -31,5 +31,5 @@
 		return NULL;
 	}
 
-	return __getgrent(fileno(file));
+	return bb_getgrent(fileno(file));
 }

Index: getgrnam.c
===================================================================
RCS file: /var/cvs/busybox/libpwdgrp/getgrnam.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- getgrnam.c	26 Jul 2003 07:48:13 -0000	1.3
+++ getgrnam.c	18 Dec 2003 22:40:58 -0000	1.4
@@ -39,7 +39,7 @@
 	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;

Index: __getgrent.c
===================================================================
RCS file: /var/cvs/busybox/libpwdgrp/__getgrent.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- __getgrent.c	7 Dec 2002 23:14:39 -0000	1.4
+++ __getgrent.c	18 Dec 2003 22:40:58 -0000	1.5
@@ -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];

Index: initgroups.c
===================================================================
RCS file: /var/cvs/busybox/libpwdgrp/initgroups.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- initgroups.c	26 Jul 2003 07:48:13 -0000	1.5
+++ initgroups.c	18 Dec 2003 22:40:58 -0000	1.6
@@ -89,9 +89,9 @@
 	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)