X-Git-Url: https://git.cameronkatri.com/pw-darwin.git/blobdiff_plain/d310991f0b18bc6b9ef554b660ea88170557c76f..f51ea5a6dc09ca726b14a65d08ee2496cb81c117:/libutil/pw_util.c

diff --git a/libutil/pw_util.c b/libutil/pw_util.c
index 93bf4e1..2c082e4 100644
--- a/libutil/pw_util.c
+++ b/libutil/pw_util.c
@@ -36,7 +36,7 @@
 static const char sccsid[] = "@(#)pw_util.c	8.3 (Berkeley) 4/2/94";
 #endif
 static const char rcsid[] =
-	"$Id: pw_util.c,v 1.11 1998/10/20 11:34:11 des Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
@@ -66,10 +66,14 @@ static const char rcsid[] =
 extern char *tempname;
 static pid_t editpid = -1;
 static int lockfd;
+static char _default_editor[] = _PATH_VI;
+char mppath[] = _PATH_PWD;
+char masterpasswd[] = _PATH_MASTERPASSWD;
+
+void		 pw_cont(int);
 
 void
-pw_cont(sig)
-	int sig;
+pw_cont(int sig)
 {
 
 	if (editpid != -1)
@@ -77,7 +81,7 @@ pw_cont(sig)
 }
 
 void
-pw_init()
+pw_init(void)
 {
 	struct rlimit rlim;
 
@@ -107,7 +111,7 @@ pw_init()
 }
 
 int
-pw_lock()
+pw_lock(void)
 {
 	/*
 	 * If the master password file doesn't exist, the system is hosed.
@@ -116,36 +120,39 @@ pw_lock()
 	 * Open should allow flock'ing the file; see 4.4BSD.	XXX
 	 */
 	for (;;) {
-	    struct stat st;
+		struct stat st;
 
-	    lockfd = open(_PATH_MASTERPASSWD, O_RDONLY, 0);
-	    if (lockfd < 0 || fcntl(lockfd, F_SETFD, 1) == -1)
-		    err(1, "%s", _PATH_MASTERPASSWD);
-	    if (flock(lockfd, LOCK_EX|LOCK_NB))
-		    errx(1, "the password db file is busy");
+		lockfd = open(masterpasswd, O_RDONLY, 0);
+		if (lockfd < 0 || fcntl(lockfd, F_SETFD, 1) == -1)
+			err(1, "%s", masterpasswd);
+		if (flock(lockfd, LOCK_EX|LOCK_NB))
+			errx(1, "the password db file is busy");
 
-	    /*
-	     * If the password file was replaced while we were trying to
-	     * get the lock, our hardlink count will be 0 and we have to
-	     * close and retry.
-	     */
-	    if (fstat(lockfd, &st) < 0)
-		    errx(1, "fstat() failed");
-	    if (st.st_nlink != 0)
-		    break;
-	    close(lockfd);
-	    lockfd = -1;
+		/*
+		 * If the password file was replaced while we were trying to
+		 * get the lock, our hardlink count will be 0 and we have to
+		 * close and retry.
+		 */
+		if (fstat(lockfd, &st) < 0)
+			errx(1, "fstat() failed");
+		if (st.st_nlink != 0)
+			break;
+		close(lockfd);
+		lockfd = -1;
 	}
 	return (lockfd);
 }
 
 int
-pw_tmp()
+pw_tmp(void)
 {
-	static char path[MAXPATHLEN] = _PATH_MASTERPASSWD;
+	static char path[MAXPATHLEN];
 	int fd;
 	char *p;
 
+	strncpy(path, masterpasswd, MAXPATHLEN - 1);
+	path[MAXPATHLEN] = '\0';
+
 	if ((p = strrchr(path, '/')))
 		++p;
 	else
@@ -158,8 +165,7 @@ pw_tmp()
 }
 
 int
-pw_mkdb(username)
-char *username;
+pw_mkdb(const char *username)
 {
 	int pstat;
 	pid_t pid;
@@ -168,11 +174,12 @@ char *username;
 	if (!(pid = fork())) {
 		if(!username) {
 			warnx("rebuilding the database...");
-			execl(_PATH_PWD_MKDB, "pwd_mkdb", "-p", tempname, NULL);
+			execl(_PATH_PWD_MKDB, "pwd_mkdb", "-p", "-d", mppath,
+			    tempname, (char *)NULL);
 		} else {
 			warnx("updating the database...");
-			execl(_PATH_PWD_MKDB, "pwd_mkdb", "-p", "-u", 
-					username, tempname, NULL);
+			execl(_PATH_PWD_MKDB, "pwd_mkdb", "-p", "-d", mppath,
+			    "-u", username, tempname, (char *)NULL);
 		}
 		pw_error(_PATH_PWD_MKDB, 1, 1);
 	}
@@ -184,14 +191,13 @@ char *username;
 }
 
 void
-pw_edit(notsetuid)
-	int notsetuid;
+pw_edit(int notsetuid)
 {
 	int pstat;
 	char *p, *editor;
 
 	if (!(editor = getenv("EDITOR")))
-		editor = _PATH_VI;
+		editor = _default_editor;
 	if ((p = strrchr(editor, '/')))
 		++p;
 	else
@@ -203,7 +209,7 @@ pw_edit(notsetuid)
 			(void)setuid(getuid());
 		}
 		errno = 0;
-		execlp(editor, p, tempname, NULL);
+		execlp(editor, p, tempname, (char *)NULL);
 		_exit(errno);
 	}
 	for (;;) {
@@ -222,7 +228,7 @@ pw_edit(notsetuid)
 }
 
 void
-pw_prompt()
+pw_prompt(void)
 {
 	int c, first;
 
@@ -236,21 +242,23 @@ pw_prompt()
 }
 
 void
-pw_error(name, err, eval)
-	char *name;
-	int err, eval;
+pw_error(const char *name, int error, int eval)
 {
 #ifdef YP
 	extern int _use_yp;
 #endif /* YP */
-	if (err)
-		warn(name);
+	if (error) {
+		if (name != NULL)
+			warn("%s", name);
+		else
+			warn(NULL);
+	}
 #ifdef YP
 	if (_use_yp)
 		warnx("NIS information unchanged");
 	else
 #endif /* YP */
-	warnx("%s: unchanged", _PATH_MASTERPASSWD);
+	warnx("%s: unchanged", masterpasswd);
 	(void)unlink(tempname);
 	exit(eval);
 }