Really fix -o

[pw-darwin.git] / pw / pw.c

diff --git a/pw/pw.c b/pw/pw.c
index ae030ec164840deb3e06c58ae80c47aec2479e02..5ad2511aeb10eb173b880cac1f9345417c9557a8 100644 (file)
--- a/pw/pw.c
+++ b/pw/pw.c
@@ -136,7 +136,10 @@ main(int argc, char *argv[])
        name = NULL;
        relocated = nis = false;
        memset(&conf, 0, sizeof(conf));
+       strlcpy(conf.rootdir, "/", sizeof(conf.rootdir));
        strlcpy(conf.etcpath, _PATH_PWD, sizeof(conf.etcpath));
+       conf.fd = -1;
+       conf.checkduplicate = true;
 
        LIST_INIT(&arglist);
 
@@ -214,6 +217,10 @@ main(int argc, char *argv[])
        if (mode == -1 || which == -1)
                cmdhelp(mode, which);
 
+       conf.rootfd = open(conf.rootdir, O_DIRECTORY|O_CLOEXEC);
+       if (conf.rootfd == -1)
+               errx(EXIT_FAILURE, "Unable to open '%s'", conf.rootdir);
+       conf.which = which;
        /*
         * We know which mode we're in and what we're about to do, so now
         * let's dispatch the remaining command line args in a genric way.
@@ -229,7 +236,11 @@ main(int argc, char *argv[])
                        conf.v7 = true;
                        break;
                case 'C':
-                       config = optarg;
+                       conf.config = optarg;
+                       config = conf.config;
+                       break;
+               case 'F':
+                       conf.force = true;
                        break;
                case 'N':
                        conf.dryrun = true;
@@ -245,16 +256,31 @@ main(int argc, char *argv[])
                case 'Y':
                        nis = true;
                        break;
+               case 'a':
+                       conf.all = true;
+                       break;
+               case 'c':
+                       conf.gecos = pw_checkname(optarg, 1);
+                       break;
                case 'g':
                        if (which == 0) { /* for user* */
                                addarg(&arglist, 'g', optarg);
                                break;
                        }
-                       /* FALLTHROUGH */
-               case 'u':
                        if (strspn(optarg, "0123456789") != strlen(optarg))
-                               errx(EX_USAGE, "%s expects a number",
-                                   which == 1 ? "-g" : "-u" );
+                               errx(EX_USAGE, "-g expects a number");
+                       id = strtonum(optarg, 0, LONG_MAX, &errstr);
+                       if (errstr != NULL)
+                               errx(EX_USAGE, "Bad id '%s': %s", optarg,
+                                   errstr);
+                       break;
+               case 'u':
+                       if (strspn(optarg, "0123456789,") != strlen(optarg))
+                               errx(EX_USAGE, "-u expects a number");
+                       if (strchr(optarg, ',') != NULL) {
+                               addarg(&arglist, 'u', optarg);
+                               break;
+                       }
                        id = strtonum(optarg, 0, LONG_MAX, &errstr);
                        if (errstr != NULL)
                                errx(EX_USAGE, "Bad id '%s': %s", optarg,
@@ -269,6 +295,45 @@ main(int argc, char *argv[])
                        if (errstr != NULL)
                                errx(EX_USAGE, "Bad id '%s': %s", optarg,
                                    errstr);
+                       break;
+               case 'H':
+                       if (conf.fd != -1)
+                               errx(EX_USAGE, "'-h' and '-H' are mutually "
+                                   "exclusive options");
+                       conf.precrypted = true;
+                       if (strspn(optarg, "0123456789") != strlen(optarg))
+                               errx(EX_USAGE, "'-H' expects a file descriptor");
+
+                       conf.fd = strtonum(optarg, 0, INT_MAX, &errstr);
+                       if (errstr != NULL)
+                               errx(EX_USAGE, "Bad file descriptor '%s': %s",
+                                   optarg, errstr);
+                       break;
+               case 'h':
+                       if (conf.fd != -1)
+                               errx(EX_USAGE, "'-h' and '-H' are mutually "
+                                   "exclusive options");
+
+                       if (strcmp(optarg, "-") == 0)
+                               conf.fd = '-';
+                       else if (strspn(optarg, "0123456789") == strlen(optarg)) {
+                               conf.fd = strtonum(optarg, 0, INT_MAX, &errstr);
+                               if (errstr != NULL)
+                                       errx(EX_USAGE, "'-h' expects a "
+                                           "file descriptor or '-'");
+                       } else
+                               errx(EX_USAGE, "'-h' expects a file "
+                                   "descriptor or '-'");
+                       break;
+               case 'o':
+                       conf.checkduplicate = false;
+                       break;
+               case 'q':
+                       conf.quiet = true;
+                       break;
+               case 'r':
+                       conf.deletehome = true;
+                       break;
                default:
                        addarg(&arglist, ch, optarg);
                        break;
@@ -289,7 +354,7 @@ main(int argc, char *argv[])
         * We should immediately look for the -q 'quiet' switch so that we
         * don't bother with extraneous errors
         */
-       if (getarg(&arglist, 'q') != NULL)
+       if (conf.quiet)
                freopen(_PATH_DEVNULL, "w", stderr);
 
        /*
@@ -522,7 +587,12 @@ cmdhelp(int mode, int which)
 struct carg    *
 getarg(struct cargs * _args, int ch)
 {
-       struct carg    *c = LIST_FIRST(_args);
+       struct carg    *c;
+
+       if (_args == NULL)
+               return (NULL);
+       
+       c = LIST_FIRST(_args);
 
        while (c != NULL && c->ch != ch)
                c = LIST_NEXT(c, list);