Rewrite parsing subcommands arguments of pw(8)

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

diff --git a/pw/pw.c b/pw/pw.c
index 0c41f03e565c22738f70fbe0cfc7a14ad1173483..b13db70a57d110b6d1f0cb670fa35d9e3393f3e0 100644 (file)
--- a/pw/pw.c
+++ b/pw/pw.c
@@ -33,12 +33,10 @@ static const char rcsid[] =
 #include <fcntl.h>
 #include <locale.h>
 #include <paths.h>
 #include <fcntl.h>
 #include <locale.h>
 #include <paths.h>

+#include <stdbool.h>

 #include <sys/wait.h>
 #include "pw.h"
 
 #include <sys/wait.h>
 #include "pw.h"
 

-#if !defined(_PATH_YP)
-#define        _PATH_YP        "/var/yp/"
-#endif

 const char     *Modes[] = {
   "add", "del", "mod", "show", "next",
   NULL};
 const char     *Modes[] = {
   "add", "del", "mod", "show", "next",
   NULL};


@@ -56,7 +54,7 @@ static const char *Combo2[] = {
 
 struct pwf PWF =
 {
 
 struct pwf PWF =
 {

-       0,
+       PWF_REGULAR,

        setpwent,
        endpwent,
        getpwent,
        setpwent,
        endpwent,
        getpwent,


@@ -71,7 +69,7 @@ struct pwf PWF =
 };
 struct pwf VPWF =
 {
 };
 struct pwf VPWF =
 {

-       1,
+       PWF_ALT,

        vsetpwent,
        vendpwent,
        vgetpwent,
        vsetpwent,
        vendpwent,
        vgetpwent,


@@ -84,64 +82,63 @@ struct pwf VPWF =
        vgetgrnam,
 };
 
        vgetgrnam,
 };
 

-static struct cargs arglist;
+static int (*cmdfunc[W_NUM][M_NUM])(int argc, char **argv, char *_name) = {
+       { /* user */
+               pw_user_add,
+               pw_user_del,
+               pw_user_mod,
+               pw_user_show,
+               pw_user_next,
+               pw_user_lock,
+               pw_user_unlock,
+       },
+       { /* group */
+               pw_group_add,
+               pw_group_del,
+               pw_group_mod,
+               pw_group_show,
+               pw_group_next,
+       }
+};

 
 

-static int      getindex(const char *words[], const char *word);
-static void     cmdhelp(int mode, int which);
+struct pwconf conf;

 
 

+static int     getindex(const char *words[], const char *word);
+static void    cmdhelp(int mode, int which);

 
 int
 main(int argc, char *argv[])
 {
 
 int
 main(int argc, char *argv[])
 {

-       int             ch;
-       int             mode = -1;
-       int             which = -1;
-       char            *config = NULL;
-       struct userconf *cnf;
+       int             mode = -1, which = -1, tmp;

        struct stat     st;
        struct stat     st;

+       char            arg, *arg1;
+       bool            relocated, nis;

 
 

-       static const char *opts[W_NUM][M_NUM] =
-       {
-               { /* user */
-                       "V:C:qn:u:c:d:e:p:g:G:mM:k:s:oL:i:w:h:H:Db:NPy:Y",
-                       "V:C:qn:u:rY",
-                       "V:C:qn:u:c:d:e:p:g:G:mM:l:k:s:w:L:h:H:FNPY",
-                       "V:C:qn:u:FPa7",
-                       "V:C:q",
-                       "V:C:q",
-                       "V:C:q"
-               },
-               { /* grp  */
-                       "V:C:qn:g:h:H:M:opNPY",
-                       "V:C:qn:g:Y",
-                       "V:C:qn:d:g:l:h:H:FM:m:NPY",
-                       "V:C:qn:g:FPa",
-                       "V:C:q"
-                }
-       };
-
-       static int      (*funcs[W_NUM]) (struct userconf * _cnf, int _mode, struct cargs * _args) =
-       {                       /* Request handlers */
-               pw_user,
-               pw_group
-       };
+       arg1 = 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);
-
-       (void)setlocale(LC_ALL, "");
+       setlocale(LC_ALL, "");

 
        /*
         * Break off the first couple of words to determine what exactly
         * we're being asked to do
         */
        while (argc > 1) {
 
        /*
         * Break off the first couple of words to determine what exactly
         * we're being asked to do
         */
        while (argc > 1) {

-               int             tmp;
-

                if (*argv[1] == '-') {
                        /*
                         * Special case, allow pw -V<dir> <operation> [args] for scripts etc.
                         */
                if (*argv[1] == '-') {
                        /*
                         * Special case, allow pw -V<dir> <operation> [args] for scripts etc.
                         */

-                       if (argv[1][1] == 'V') {
+                       arg = argv[1][1];
+                       if (arg == 'V' || arg == 'R') {
+                               if (relocated)
+                                       errx(EXIT_FAILURE, "Both '-R' and '-V' "
+                                           "specified, only one accepted");
+                               relocated = true;

                                optarg = &argv[1][2];
                                if (*optarg == '\0') {
                                        if (stat(argv[2], &st) != 0)
                                optarg = &argv[1][2];
                                if (*optarg == '\0') {
                                        if (stat(argv[2], &st) != 0)


@@ -155,7 +152,14 @@ main(int argc, char *argv[])
                                        ++argv;
                                        --argc;
                                }
                                        ++argv;
                                        --argc;
                                }

-                               addarg(&arglist, 'V', optarg);
+                               memcpy(&PWF, &VPWF, sizeof PWF);
+                               if (arg == 'R') {
+                                       strlcpy(conf.rootdir, optarg,
+                                           sizeof(conf.rootdir));
+                                       PWF._altdir = PWF_ROOTDIR;
+                               }
+                               snprintf(conf.etcpath, sizeof(conf.etcpath),
+                                   "%s%s", optarg, arg == 'R' ? "/etc" : "");

                        } else
                                break;
                }
                        } else
                                break;
                }


@@ -171,7 +175,7 @@ main(int argc, char *argv[])
                } else if (strcmp(argv[1], "help") == 0 && argv[2] == NULL)
                        cmdhelp(mode, which);
                else if (which != -1 && mode != -1)
                } else if (strcmp(argv[1], "help") == 0 && argv[2] == NULL)
                        cmdhelp(mode, which);
                else if (which != -1 && mode != -1)

-                       addarg(&arglist, 'n', argv[1]);
+                               arg1 = argv[1];

                else
                        errx(EX_USAGE, "unknown keyword `%s'", argv[1]);
                ++argv;
                else
                        errx(EX_USAGE, "unknown keyword `%s'", argv[1]);
                ++argv;


@@ -184,100 +188,25 @@ main(int argc, char *argv[])
        if (mode == -1 || which == -1)
                cmdhelp(mode, which);
 
        if (mode == -1 || which == -1)
                cmdhelp(mode, 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.
-        */
-       optarg = NULL;
-
-       while ((ch = getopt(argc, argv, opts[which][mode])) != -1) {
-               if (ch == '?')
-                       errx(EX_USAGE, "unknown switch");
-               else
-                       addarg(&arglist, ch, optarg);
-               optarg = NULL;
-       }
-
-       /*
-        * Must be root to attempt an update
-        */
-       if (geteuid() != 0 && mode != M_PRINT && mode != M_NEXT && getarg(&arglist, 'N')==NULL)
-               errx(EX_NOPERM, "you must be root to run this program");
-
-       /*
-        * We should immediately look for the -q 'quiet' switch so that we
-        * don't bother with extraneous errors
-        */
-       if (getarg(&arglist, 'q') != NULL)
-               freopen(_PATH_DEVNULL, "w", stderr);
-
-       /*
-        * Set our base working path if not overridden
-        */
-
-       config = getarg(&arglist, 'C') ? getarg(&arglist, 'C')->val : NULL;
+       conf.rootfd = open(conf.rootdir, O_DIRECTORY|O_CLOEXEC);
+       if (conf.rootfd == -1)
+               errx(EXIT_FAILURE, "Unable to open '%s'", conf.rootdir);

 
 

-       if (getarg(&arglist, 'V') != NULL) {
-               char * etcpath = getarg(&arglist, 'V')->val;
-               if (*etcpath) {
-                       if (config == NULL) {   /* Only override config location if -C not specified */
-                               asprintf(&config, "%s/pw.conf", etcpath);
-                               if (config == NULL)
-                                        errx(EX_OSERR, "out of memory");
-                       }
-                       memcpy(&PWF, &VPWF, sizeof PWF);
-                       setpwdir(etcpath);
-                       setgrdir(etcpath);
-               }
-       }
-
-       /*
-        * Now, let's do the common initialisation
-        */
-       cnf = read_userconfig(config);
-
-       ch = funcs[which] (cnf, mode, &arglist);
-
-       /*
-        * 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) {
-               pid_t   pid;
-
-               fflush(NULL);
-               if (chdir(_PATH_YP) == -1)
-                       warn("chdir(" _PATH_YP ")");
-               else if ((pid = fork()) == -1)
-                       warn("fork()");
-               else if (pid == 0) {
-                       /* Is make anywhere else? */
-                       execlp("/usr/bin/make", "make", (char *)NULL);
-                       _exit(1);
-               } else {
-                       int   i;
-                       waitpid(pid, &i, 0);
-                       if ((i = WEXITSTATUS(i)) != 0)
-                               errx(ch, "make exited with status %d", i);
-                       else
-                               pw_log(cnf, mode, which, "NIS maps updated");
-               }
-       }
-       return ch;
+       return (cmdfunc[which][mode](argc, argv, arg1));

 }
 
 
 static int
 getindex(const char *words[], const char *word)
 {
 }
 
 
 static int
 getindex(const char *words[], const char *word)
 {

-       int             i = 0;
+       int     i = 0;

 
        while (words[i]) {
                if (strcmp(words[i], word) == 0)
 
        while (words[i]) {
                if (strcmp(words[i], word) == 0)

-                       return i;
+                       return (i);

                i++;
        }
                i++;
        }

-       return -1;
+       return (-1);

 }
 
 
 }
 
 


@@ -303,6 +232,7 @@ cmdhelp(int mode, int which)
                        {
                                "usage: pw useradd [name] [switches]\n"
                                "\t-V etcdir      alternate /etc location\n"
                        {
                                "usage: pw useradd [name] [switches]\n"
                                "\t-V etcdir      alternate /etc location\n"

+                               "\t-R rootir      alternate root directory\n"

                                "\t-C config      configuration file\n"
                                "\t-q             quiet operation\n"
                                "  Adding users:\n"
                                "\t-C config      configuration file\n"
                                "\t-q             quiet operation\n"
                                "  Adding users:\n"


@@ -325,7 +255,8 @@ cmdhelp(int mode, int which)
                                "\t-N             no update\n"
                                "  Setting defaults:\n"
                                "\t-V etcdir      alternate /etc location\n"
                                "\t-N             no update\n"
                                "  Setting defaults:\n"
                                "\t-V etcdir      alternate /etc location\n"

-                               "\t-D             set user defaults\n"
+                               "\t-R rootir      alternate root directory\n"
+                               "\t-D             set user defaults\n"

                                "\t-b dir         default home root dir\n"
                                "\t-e period      default expiry period\n"
                                "\t-p period      default password change period\n"
                                "\t-b dir         default home root dir\n"
                                "\t-e period      default expiry period\n"
                                "\t-p period      default password change period\n"


@@ -341,12 +272,15 @@ cmdhelp(int mode, int which)
                                "\t-y path        set NIS passwd file path\n",
                                "usage: pw userdel [uid|name] [switches]\n"
                                "\t-V etcdir      alternate /etc location\n"
                                "\t-y path        set NIS passwd file path\n",
                                "usage: pw userdel [uid|name] [switches]\n"
                                "\t-V etcdir      alternate /etc location\n"

+                               "\t-R rootir      alternate root directory\n"

                                "\t-n name        login name\n"
                                "\t-u uid         user id\n"
                                "\t-Y             update NIS maps\n"
                                "\t-n name        login name\n"
                                "\t-u uid         user id\n"
                                "\t-Y             update NIS maps\n"

+                               "\t-y path        set NIS passwd file path\n"

                                "\t-r             remove home & contents\n",
                                "usage: pw usermod [uid|name] [switches]\n"
                                "\t-V etcdir      alternate /etc location\n"
                                "\t-r             remove home & contents\n",
                                "usage: pw usermod [uid|name] [switches]\n"
                                "\t-V etcdir      alternate /etc location\n"

+                               "\t-R rootir      alternate root directory\n"

                                "\t-C config      configuration file\n"
                                "\t-q             quiet operation\n"
                                "\t-F             force add if no user\n"
                                "\t-C config      configuration file\n"
                                "\t-q             quiet operation\n"
                                "\t-F             force add if no user\n"


@@ -367,9 +301,11 @@ cmdhelp(int mode, int which)
                                "\t-h fd          read password on fd\n"
                                "\t-H fd          read encrypted password on fd\n"
                                "\t-Y             update NIS maps\n"
                                "\t-h fd          read password on fd\n"
                                "\t-H fd          read encrypted password on fd\n"
                                "\t-Y             update NIS maps\n"

+                               "\t-y path        set NIS passwd file path\n"

                                "\t-N             no update\n",
                                "usage: pw usershow [uid|name] [switches]\n"
                                "\t-V etcdir      alternate /etc location\n"
                                "\t-N             no update\n",
                                "usage: pw usershow [uid|name] [switches]\n"
                                "\t-V etcdir      alternate /etc location\n"

+                               "\t-R rootir      alternate root directory\n"

                                "\t-n name        login name\n"
                                "\t-u uid         user id\n"
                                "\t-F             force print\n"
                                "\t-n name        login name\n"
                                "\t-u uid         user id\n"
                                "\t-F             force print\n"


@@ -378,6 +314,7 @@ cmdhelp(int mode, int which)
                                "\t-7             print in v7 format\n",
                                "usage: pw usernext [switches]\n"
                                "\t-V etcdir      alternate /etc location\n"
                                "\t-7             print in v7 format\n",
                                "usage: pw usernext [switches]\n"
                                "\t-V etcdir      alternate /etc location\n"

+                               "\t-R rootir      alternate root directory\n"

                                "\t-C config      configuration file\n"
                                "\t-q             quiet operation\n",
                                "usage pw: lock [switches]\n"
                                "\t-C config      configuration file\n"
                                "\t-q             quiet operation\n",
                                "usage pw: lock [switches]\n"


@@ -392,6 +329,7 @@ cmdhelp(int mode, int which)
                        {
                                "usage: pw groupadd [group|gid] [switches]\n"
                                "\t-V etcdir      alternate /etc location\n"
                        {
                                "usage: pw groupadd [group|gid] [switches]\n"
                                "\t-V etcdir      alternate /etc location\n"

+                               "\t-R rootir      alternate root directory\n"

                                "\t-C config      configuration file\n"
                                "\t-q             quiet operation\n"
                                "\t-n group       group name\n"
                                "\t-C config      configuration file\n"
                                "\t-q             quiet operation\n"
                                "\t-n group       group name\n"


@@ -402,11 +340,13 @@ cmdhelp(int mode, int which)
                                "\t-N             no update\n",
                                "usage: pw groupdel [group|gid] [switches]\n"
                                "\t-V etcdir      alternate /etc location\n"
                                "\t-N             no update\n",
                                "usage: pw groupdel [group|gid] [switches]\n"
                                "\t-V etcdir      alternate /etc location\n"

+                               "\t-R rootir      alternate root directory\n"

                                "\t-n name        group name\n"
                                "\t-g gid         group id\n"
                                "\t-Y             update NIS maps\n",
                                "usage: pw groupmod [group|gid] [switches]\n"
                                "\t-V etcdir      alternate /etc location\n"
                                "\t-n name        group name\n"
                                "\t-g gid         group id\n"
                                "\t-Y             update NIS maps\n",
                                "usage: pw groupmod [group|gid] [switches]\n"
                                "\t-V etcdir      alternate /etc location\n"

+                               "\t-R rootir      alternate root directory\n"

                                "\t-C config      configuration file\n"
                                "\t-q             quiet operation\n"
                                "\t-F             force add if not exists\n"
                                "\t-C config      configuration file\n"
                                "\t-q             quiet operation\n"
                                "\t-F             force add if not exists\n"


@@ -420,6 +360,7 @@ cmdhelp(int mode, int which)
                                "\t-N             no update\n",
                                "usage: pw groupshow [group|gid] [switches]\n"
                                "\t-V etcdir      alternate /etc location\n"
                                "\t-N             no update\n",
                                "usage: pw groupshow [group|gid] [switches]\n"
                                "\t-V etcdir      alternate /etc location\n"

+                               "\t-R rootir      alternate root directory\n"

                                "\t-n name        group name\n"
                                "\t-g gid         group id\n"
                                "\t-F             force print\n"
                                "\t-n name        group name\n"
                                "\t-g gid         group id\n"
                                "\t-F             force print\n"


@@ -427,6 +368,7 @@ cmdhelp(int mode, int which)
                                "\t-a             print all accounting groups\n",
                                "usage: pw groupnext [switches]\n"
                                "\t-V etcdir      alternate /etc location\n"
                                "\t-a             print all accounting groups\n",
                                "usage: pw groupnext [switches]\n"
                                "\t-V etcdir      alternate /etc location\n"

+                               "\t-R rootir      alternate root directory\n"

                                "\t-C config      configuration file\n"
                                "\t-q             quiet operation\n"
                        }
                                "\t-C config      configuration file\n"
                                "\t-q             quiet operation\n"
                        }


@@ -436,26 +378,3 @@ cmdhelp(int mode, int which)
        }
        exit(EXIT_FAILURE);
 }
        }
        exit(EXIT_FAILURE);
 }

-
-struct carg    *
-getarg(struct cargs * _args, int ch)
-{
-       struct carg    *c = LIST_FIRST(_args);
-
-       while (c != NULL && c->ch != ch)
-               c = LIST_NEXT(c, list);
-       return c;
-}
-
-struct carg    *
-addarg(struct cargs * _args, int ch, char *argstr)
-{
-       struct carg    *ca = malloc(sizeof(struct carg));
-
-       if (ca == NULL)
-               errx(EX_OSERR, "out of memory");
-       ca->ch = ch;
-       ca->val = argstr;
-       LIST_INSERT_HEAD(_args, ca, list);
-       return ca;
-}