1) 200 users per group limitation removed and pw

	will handle lines of any length in /etc/group.
2)	Fixed bug with usermod -d not updating user's home
	directory.
3)	Minor formatting display changes/fixes with *show -P.

1 files changed, 129 insertions, 105 deletions

diff --git a/pw/edgroup.c b/pw/edgroup.c
index 34a22d1..c7b379c 100644
--- a/pw/edgroup.c
+++ b/pw/edgroup.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: edgroup.c,v 1.1.1.1 1996/12/09 14:05:35 joerg Exp $
+ *	$Id: edgroup.c,v 1.1.1.2 1996/12/10 23:58:54 joerg Exp $
  */
 
 #include <stdio.h>
@@ -47,7 +47,7 @@ isingroup(char const * name, char **mem)
 {
 	int             i;
 
-	for (i = 0; i < MAXGROUPS && mem[i] != NULL; i++)
+	for (i = 0; mem[i] != NULL; i++)
 		if (strcmp(name, mem[i]) == 0)
 			return i;
 	return -1;
@@ -76,119 +76,143 @@ editgroups(char *name, char **groups)
 				if ((outfp = fdopen(outfd, "w+")) == NULL)
 					close(outfd);
 				else {
-					char            line[MAXPWLINE];
-					char            outl[MAXPWLINE];
-
-					while (fgets(line, sizeof(line), infp) != NULL) {
-						char           *p = strchr(line, '\n');
-
-						if (p == NULL) {	/* Line too long */
-							int             ch;
-
-							fputs(line, outfp);
-							while ((ch = fgetc(infp)) != EOF) {
-								fputc(ch, outfp);
-								if (ch == '\n')
-									break;
-							}
-							continue;
-						}
-						if (*line == '#')
-							strcpy(outl, line);
-						else if (*line == '\n')
-							*outl = '\0';
-						else {
-							int             i,
-							                mno = 0;
-							char           *cp = line;
-							char const     *sep = ":\n";
-							struct group    grp;
-							char           *mems[MAXGROUPS];
-
-							memset(&grp, 0, sizeof grp);
-							grp.gr_mem = mems;
-							for (i = 0; (p = strsep(&cp, sep)) != NULL; i++) {
-								switch (i) {
-								case 0:	/* Group name */
-									grp.gr_name = p;
-									break;
-								case 1:	/* Group password */
-									grp.gr_passwd = p;
-									break;
-								case 2:	/* Group id */
-									grp.gr_gid = atoi(p);
-									break;
-								case 3:	/* Member list */
-									cp = p;
-									sep = ",\n";
-									break;
-								default:	/* Individual members */
-									if (mno < MAXGROUPS && *p)
-										mems[mno++] = p;
-									break;
+					int		linelen = PWBUFSZ;
+					int		outlen =  PWBUFSZ;
+					int		memlen = 200; /* Arbitrary */
+					char           *line = malloc(linelen);
+					char           *outl = malloc(outlen);
+					char	      **mems = malloc(memlen * sizeof(char *));
+					int		namlen = strlen(name);
+
+					if (line == NULL || outl == NULL || mems == NULL) {
+					    mem_abort:
+						rc = 0;
+					} else {
+						while (fgets(line, linelen, infp) != NULL) {
+							char           *p;
+							int		l;
+
+							while ((p = strchr(line, '\n')) == NULL)
+							{
+								if (extendline(&line, &linelen, linelen + PWBUFSZ) == -1) {
+									goto mem_abort;
 								}
+								l = strlen(line);
+								if (fgets(line + l, linelen - l, infp) == NULL)
+									break;	/* No newline terminator on last line */
 							}
-							if (i < 2)	/* Bail out -
-									 * insufficient fields */
-								continue;
-
-							for (i = mno; i < MAXGROUPS; i++)
-								mems[i] = NULL;
-
-							/*
-							 * Delete from group, or add to group?
-							 */
-							if (groups == NULL || isingroup(grp.gr_name, groups) == -1) {	/* Delete */
-								int             idx;
+							l = strlen(line) + namlen + 1;
+							if (extendline(&outl, &outlen, l) == -1) {
+								goto mem_abort;
+							}
+							if (*line == '#')
+								strcpy(outl, line);
+							else if (*line == '\n')
+								*outl = '\0';
+							else {
+								int             i,
+									        mno = 0;
+								char           *cp = line;
+								char const     *sep = ":\n";
+								struct group    grp;
+
+								memset(&grp, 0, sizeof grp);
+								for (i = 0; (p = strsep(&cp, sep)) != NULL; i++) {
+									switch (i) {
+									case 0:	/* Group name */
+										grp.gr_name = p;
+										break;
+									case 1:	/* Group password */
+										grp.gr_passwd = p;
+										break;
+									case 2:	/* Group id */
+										grp.gr_gid = atoi(p);
+										break;
+									case 3:	/* Member list */
+										cp = p;
+										sep = ",\n";
+										break;
+									default:	/* Individual members */
+										if (*p) {
+											if (extendarray(&mems, &memlen, mno + 2) == -1) {
+												goto mem_abort;
+											}
+											mems[mno++] = p;
+										}
+										break;
+									}
+								}
+								if (i < 2)	/* Bail out - insufficient fields */
+									continue;
 
-								while ((idx = isingroup(name, mems)) != -1) {
-									for (i = idx; i < (MAXGROUPS - 1); i++)
-										mems[i] = mems[i + 1];
+								grp.gr_mem = mems;
+								for (i = mno; i < memlen; i++)
 									mems[i] = NULL;
-									--mno;
-								}
 
 								/*
-								 * Special case - deleting user and group may be user's own
+								 * Delete from group, or add to group?
 								 */
-								if (groups == NULL && mems[0] == NULL && strcmp(name, grp.gr_name) == 0) {	/* First, make _sure_ we
-																		 * don't have other
-																		 * members */
-									struct passwd  *pwd;
-
-									setpwent();
-									while ((pwd = getpwent()) != NULL && pwd->pw_gid != grp.gr_gid);
-									endpwent();
-									if (pwd == NULL)	/* No members at all */
-										continue;	/* Drop the group */
+								if (groups == NULL || isingroup(grp.gr_name, groups) == -1) {	/* Delete */
+									int             idx;
+
+									while ((idx = isingroup(name, mems)) != -1) {
+										for (i = idx; i < (memlen - 1); i++)
+											mems[i] = mems[i + 1];
+										mems[i] = NULL;
+										--mno;
+									}
+									/*
+									 * Special case - deleting user and group may be user's own
+									 */
+									if (groups == NULL && mems[0] == NULL && strcmp(name, grp.gr_name) == 0) {
+										/*
+										 * First, make _sure_ we don't have other members
+										 */
+										struct passwd  *pwd;
+
+										setpwent();
+										while ((pwd = getpwent()) != NULL && pwd->pw_gid != grp.gr_gid);
+										endpwent();
+										if (pwd == NULL)	/* No members at all */
+											continue;	/* Drop the group */
+									}
+								} else if (isingroup(name, mems) == -1) {
+									if (extendarray(&mems, &memlen, mno + 2) == -1) {
+										goto mem_abort;
+									}
+									grp.gr_mem = mems;    /* May have realloced() */
+									mems[mno++] = name;
+									mems[mno  ] = NULL;
 								}
-							} else if (isingroup(name, mems) == -1)
-								mems[mno++] = name;
-							fmtgrentry(outl, &grp, PWF_GROUP);
+								fmtgrentry(&outl, &outlen, &grp, PWF_GROUP);
+							}
+							fputs(outl, outfp);
+						}
+						if (fflush(outfp) != EOF) {
+							rc = 1;
+
+							/*
+							 * Copy data back into the original file and truncate
+							 */
+							rewind(infp);
+							rewind(outfp);
+							while (fgets(outl, outlen, outfp) != NULL)
+								fputs(outl, infp);
+
+							/*
+							 * This is a gross hack, but we may have corrupted the
+							 * original file. Unfortunately, it will lose preservation
+							 * of the inode.
+							 */
+							if (fflush(infp) == EOF || ferror(infp))
+								rc = rename(grouptmp, groupfile) == 0;
+							else
+								ftruncate(infd, ftell(infp));
 						}
-						fputs(outl, outfp);
-					}
-					if (fflush(outfp) != EOF) {
-						rc = 1;
-
-						/*
-						 * Copy data back into the original file and truncate
-						 */
-						rewind(infp);
-						rewind(outfp);
-						while (fgets(line, sizeof(line), outfp) != NULL)
-							fputs(line, infp);
-
-						/*
-						 * This is a gross hack, but we may have corrupted the
-						 * original file. Unfortunately, it will lose preservation
-						 * of the inode.
-						 */
-						if (fflush(infp) == EOF || ferror(infp))
-							rc = rename(grouptmp, groupfile) == 0;
-						else
-							ftruncate(infd, ftell(infp));
 					}
+					free(mems);
+					free(outl);
+			    		free(line);
 					fclose(outfp);
 				}
 				remove(grouptmp);