diff options
author | Baptiste Daroussin <bapt@FreeBSD.org> | 2015-06-07 14:54:07 +0000 |
---|---|---|
committer | Baptiste Daroussin <bapt@FreeBSD.org> | 2015-06-07 14:54:07 +0000 |
commit | cdd490fa6a2cbd07ed099b11c2344e61c062311f (patch) | |
tree | da85c014fadec3fe4d89f419ccf68185d7ff6a32 /pw/pw.c | |
parent | 9abed571e35148d563a116eca8c222a7afa18adc (diff) | |
download | pw-darwin-cdd490fa6a2cbd07ed099b11c2344e61c062311f.tar.gz pw-darwin-cdd490fa6a2cbd07ed099b11c2344e61c062311f.tar.zst pw-darwin-cdd490fa6a2cbd07ed099b11c2344e61c062311f.zip |
Handle -C and -Y locally and stop adding them to arglist
Diffstat (limited to 'pw/pw.c')
-rw-r--r-- | pw/pw.c | 20 |
1 files changed, 15 insertions, 5 deletions
@@ -102,7 +102,7 @@ main(int argc, char *argv[]) char *config = NULL; struct stat st; char arg; - bool relocated = false; + bool relocated, nis; static const char *opts[W_NUM][M_NUM] = { @@ -130,6 +130,7 @@ main(int argc, char *argv[]) pw_group }; + relocated = nis = false; conf.rootdir[0] = '\0'; strlcpy(conf.etcpath, _PATH_PWD, sizeof(conf.etcpath)); @@ -210,10 +211,20 @@ main(int argc, char *argv[]) optarg = NULL; while ((ch = getopt(argc, argv, opts[which][mode])) != -1) { - if (ch == '?') + switch (ch) { + case '?': errx(EX_USAGE, "unknown switch"); - else + break; + case 'C': + config = optarg; + break; + case 'Y': + nis = true; + break; + default: addarg(&arglist, ch, optarg); + break; + } optarg = NULL; } @@ -234,7 +245,6 @@ main(int argc, char *argv[]) * Set our base working path if not overridden */ - config = getarg(&arglist, 'C') ? getarg(&arglist, 'C')->val : NULL; if (config == NULL) { /* Only override config location if -C not specified */ asprintf(&config, "%s/pw.conf", conf.etcpath); if (config == NULL) @@ -252,7 +262,7 @@ main(int argc, char *argv[]) * If everything went ok, and we've been asked to update * the NIS maps, then do it now */ - if (ch == EXIT_SUCCESS && getarg(&arglist, 'Y') != NULL) { + if (ch == EXIT_SUCCESS && nis) { pid_t pid; fflush(NULL); |