X-Git-Url: https://git.cameronkatri.com/pw-darwin.git/blobdiff_plain/f21ffdee49297c31796eb1cf20c5fae902293938..0dc92c2de5173e7bcbfafa2fbbfa13226eabfe28:/pw/grupd.c?ds=sidebyside

diff --git a/pw/grupd.c b/pw/grupd.c
index 753360d..edff76d 100644
--- a/pw/grupd.c
+++ b/pw/grupd.c
@@ -1,26 +1,20 @@
 /*-
- * Copyright (c) 1996 by David L. Nugent <davidn@blaze.net.au>.
- * All rights reserved.
+ * Copyright (C) 1996
+ *	David L. Nugent.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer as
- *    the first lines of this file unmodified.
+ *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by David L. Nugent.
- * 4. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
  *
- * THIS SOFTWARE IS PROVIDED BY THE DAVID L. NUGENT ``AS IS'' AND
+ * THIS SOFTWARE IS PROVIDED BY DAVID L. NUGENT AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL DAVID L. NUGENT BE LIABLE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL DAVID L. NUGENT OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
@@ -28,46 +22,106 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- *	$Id$
  */
 
+#ifndef lint
+static const char rcsid[] =
+  "$FreeBSD$";
+#endif /* not lint */
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include <stdarg.h>
-#include <errno.h>
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <sys/param.h>
 
 #include "pwupd.h"
 
+static char * grpath = _PATH_PWD;
+
 int
-fmtgrentry(char *buf, struct group * grp, int type)
+setgrdir(const char * dir)
 {
-	int             i, l;
+	if (dir == NULL)
+		return -1;
+	else {
+		char * d = malloc(strlen(dir)+1);
+		if (d == NULL)
+			return -1;
+		grpath = strcpy(d, dir);
+	}
+	return 0;
+}
 
-	if (type == PWF_STANDARD)
-		l = sprintf(buf, "%s:*:%ld:", grp->gr_name, (long) grp->gr_gid);
-	else
-		l = sprintf(buf, "%s:%s:%ld:", grp->gr_name, grp->gr_passwd, (long) grp->gr_gid);
+char *
+getgrpath(const char * file)
+{
+	static char pathbuf[MAXPATHLEN];
 
+	snprintf(pathbuf, sizeof pathbuf, "%s/%s", grpath, file);
+	return pathbuf;
+}
+
+int
+grdb(char *arg,...)
+{
 	/*
-	 * Now, list members
+	 * This is a stub for now, but maybe eventually be functional
+	 * if ever an indexed version of /etc/groups is implemented.
 	 */
-	for (i = 0; i < 200 && grp->gr_mem[i]; i++)
-		l += sprintf(buf + l, "%s%s", i ? "," : "", grp->gr_mem[i]);
-	buf[l++] = '\n';
-	buf[l] = '\0';
+	arg=arg;
+	return 0;
+}
+
+int
+fmtgrentry(char **buf, int * buflen, struct group * grp, int type)
+{
+	int             i, l;
+
+	/*
+	 * Since a group line is of arbitrary length,
+	 * we need to calculate up-front just how long
+	 * it will need to be...
+	 */
+	/*  groupname              :   password                 :  gid  : */
+	l = strlen(grp->gr_name) + 1 + strlen(grp->gr_passwd) + 1 + 5 + 1;
+	/* group members + comma separator */
+	for (i = 0; grp->gr_mem[i] != NULL; i++) {
+		l += strlen(grp->gr_mem[i]) + 1;
+	}
+	l += 2; /* For newline & NUL */
+	if (extendline(buf, buflen, l) == -1)
+		l = -1;
+	else{
+		/*
+		 * Now we can safely format
+		 */
+		if (type == PWF_STANDARD)
+			l = sprintf(*buf, "%s:*:%ld:", grp->gr_name, (long) grp->gr_gid);
+		else
+			l = sprintf(*buf, "%s:%s:%ld:", grp->gr_name, grp->gr_passwd, (long) grp->gr_gid);
+
+		/*
+		 * List members
+		 */
+		for (i = 0; grp->gr_mem[i] != NULL; i++) {
+			l += sprintf(*buf + l, "%s%s", i ? "," : "", grp->gr_mem[i]);
+		}
+
+		(*buf)[l++] = '\n';
+		(*buf)[l] = '\0';
+	}
 	return l;
 }
 
 
 int
-fmtgrent(char *buf, struct group * grp)
+fmtgrent(char **buf, int * buflen, struct group * grp)
 {
-	return fmtgrentry(buf, grp, PWF_STANDARD);
+	return fmtgrentry(buf, buflen, grp, PWF_STANDARD);
 }
 
 
@@ -75,20 +129,26 @@ static int
 gr_update(struct group * grp, char const * group, int mode)
 {
 	int             l;
-	char            pfx[32];
-	char            grbuf[MAXPWLINE];
+	char            pfx[64];
+	int		grbuflen = 0;
+	char	       *grbuf = NULL;
 
-	endgrent();
-	l = sprintf(pfx, "%s:", group);
+	ENDGRENT();
+	l = snprintf(pfx, sizeof pfx, "%s:", group);
 
 	/*
 	 * Update the group file
 	 */
-	if (grp == NULL)
-		*grbuf = '\0';
-	else
-		fmtgrentry(grbuf, grp, PWF_PASSWD);
-	return fileupdate(_PATH_GROUP, 0644, grbuf, pfx, l, mode);
+	if (grp != NULL && fmtgrentry(&grbuf, &grbuflen, grp, PWF_PASSWD) == -1)
+		l = -1;
+	else {
+		l = fileupdate(getgrpath(_GROUP), 0644, grbuf, pfx, l, mode);
+		if (l == 0)
+			l = grdb(NULL);
+	}
+	if (grbuf != NULL)
+		free(grbuf);
+	return l;
 }