diff options
author | 2015-05-10 09:23:03 +0000 | |
---|---|---|
committer | 2015-05-10 09:23:03 +0000 | |
commit | f87aeed8e4c049e6510accf0e0dfab0d29b7f27f (patch) | |
tree | b6f4c31843064b263a48b5e1c72e29647088217c /pw/pwupd.c | |
parent | 5691ab931306852c6c08a9d01a37abbaa5ddc7c0 (diff) | |
download | pw-darwin-f87aeed8e4c049e6510accf0e0dfab0d29b7f27f.tar.gz pw-darwin-f87aeed8e4c049e6510accf0e0dfab0d29b7f27f.tar.zst pw-darwin-f87aeed8e4c049e6510accf0e0dfab0d29b7f27f.zip |
The pwdb function is only used once to check the database rename it
pwdb_check and simplify it accordingly
Diffstat (limited to 'pw/pwupd.c')
-rw-r--r-- | pw/pwupd.c | 14 |
1 files changed, 4 insertions, 10 deletions
@@ -33,7 +33,6 @@ static const char rcsid[] = #include <stdlib.h> #include <string.h> #include <unistd.h> -#include <stdarg.h> #include <pwd.h> #include <libutil.h> #include <errno.h> @@ -72,19 +71,15 @@ getpwpath(char const * file) } static int -pwdb(char *arg,...) +pwdb_check(void) { int i = 0; pid_t pid; - va_list ap; char *args[10]; args[i++] = _PATH_PWD_MKDB; - va_start(ap, arg); - while (i < 6 && arg != NULL) { - args[i++] = arg; - arg = va_arg(ap, char *); - } + args[i++] = "-C"; + if (pwpath != pathpwd) { args[i++] = "-d"; args[i++] = pwpath; @@ -102,7 +97,6 @@ pwdb(char *arg,...) if (WEXITSTATUS(i)) i = EIO; } - va_end(ap); return (i); } @@ -114,7 +108,7 @@ pw_update(struct passwd * pwd, char const * user) struct passwd *old_pw = NULL; int rc, pfd, tfd; - if ((rc = pwdb("-C", NULL)) != 0) + if ((rc = pwdb_check()) != 0) return (rc); if (pwd != NULL) |