[BusyBox-cvs] busybox/loginutils addgroup.c,1.6,1.7

[Erik Andersen]

Update of /var/cvs/busybox/loginutils
In directory winder:/tmp/cvs-serv3965

Modified Files:
	addgroup.c 
Log Message:
Teach addgroup to add user names to groups


Index: addgroup.c
===================================================================
RCS file: /var/cvs/busybox/loginutils/addgroup.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- addgroup.c	14 Nov 2002 11:10:14 -0000	1.6
+++ addgroup.c	12 Dec 2002 08:57:16 -0000	1.7
@@ -83,7 +83,7 @@
 }
 
 /* append a new user to the passwd file */
-static int addgroup(const char *filename, char *group, gid_t gid)
+static int addgroup(const char *filename, char *group, gid_t gid, const char *user)
 {
 	FILE *etc_group;
 
@@ -106,7 +106,7 @@
 	/* add entry to group */
 	etc_group = xfopen(filename, "a");
 
-	fprintf(etc_group, entryfmt, group, default_passwd, gr.gr_gid, "");
+	fprintf(etc_group, entryfmt, group, default_passwd, gr.gr_gid, user);
 	fclose(etc_group);
 
 
@@ -133,6 +133,7 @@
 int addgroup_main(int argc, char **argv)
 {
 	char *group;
+	char *user;
 	gid_t gid = 0;
 
 	if (argc < 2) {
@@ -145,6 +146,12 @@
 	} else {
 		show_usage();
 	}
+
+	if (argc == 4) {
+		user = argv[3];
+	} else {
+		user = "";
+	}
 	
 	if (geteuid() != 0) {
 		error_msg_and_die
@@ -152,7 +159,7 @@
 	}
 
 	/* werk */
-	return addgroup(group_file, group, gid);
+	return addgroup(GROUP_FILE, group, gid, user);
 }
 
 /* $Id$ */