libcmd: Don't store values that we don't need

[openafs.git] / src / cmd / cmd.c

diff --git a/src/cmd/cmd.c b/src/cmd/cmd.c
index 0389188..1ead1ca 100644 (file)
--- a/src/cmd/cmd.c
+++ b/src/cmd/cmd.c
@@ -101,8 +101,11 @@ FindType(struct cmd_syndesc *as, char *aname)
            alias = alias->next;
        }
 
-       /* A hidden option must be a full match (no best matches) */
-       if (as->parms[i].flags & CMD_HIDE || !enableAbbreviation)
+       /* A hidden option, or one which cannot be abbreviated,
+        * must be a full match (no best matches) */
+       if (as->parms[i].flags & CMD_HIDE ||
+           as->parms[i].flags & CMD_NOABBRV ||
+           !enableAbbreviation)
            continue;
 
        if (strncmp(as->parms[i].name, aname, cmdlen) == 0) {
@@ -191,6 +194,7 @@ PrintSyntax(struct cmd_syndesc *as)
     int i;
     struct cmd_parmdesc *tp;
     char *str;
+    char *name;
     size_t len;
     size_t xtralen;
 
@@ -214,10 +218,30 @@ PrintSyntax(struct cmd_syndesc *as)
            continue;           /* seeked over slot */
        if (tp->flags & CMD_HIDE)
            continue;           /* skip hidden options */
+
+       /* The parameter name is the real name, plus any aliases */
+       if (!tp->aliases) {
+           name = strdup(tp->name);
+       } else {
+           size_t namelen;
+           struct cmd_item *alias;
+           namelen = strlen(tp->name) + 1;
+           for (alias = tp->aliases; alias != NULL; alias = alias->next)
+               namelen+=strlen(alias->data) + 3;
+
+           name = malloc(namelen);
+           strlcpy(name, tp->name, namelen);
+
+           for (alias = tp->aliases; alias != NULL; alias = alias->next) {
+               strlcat(name, " | ", namelen);
+               strlcat(name, alias->data, namelen);
+           }
+       }
+
        /* Work out if we can fit what we want to on this line, or if we need to
         * start a new one */
        str = ParmHelpString(tp);
-       xtralen = 1 + strlen(tp->name) + strlen(str) +
+       xtralen = 1 + strlen(name) + strlen(str) +
                  ((tp->flags & CMD_OPTIONAL)? 2: 0);
 
        if (len + xtralen > 78) {
@@ -227,7 +251,7 @@ PrintSyntax(struct cmd_syndesc *as)
 
        printf(" %s%s%s%s",
               tp->flags & CMD_OPTIONAL?"[":"",
-              tp->name,
+              name,
               str,
               tp->flags & CMD_OPTIONAL?"]":"");
        free(str);
@@ -508,8 +532,8 @@ cmd_Seek(struct cmd_syndesc *as, int apos)
 }
 
 int
-cmd_AddParmAtOffset(struct cmd_syndesc *as, char *aname, int atype,
-                   afs_int32 aflags, char *ahelp, int ref)
+cmd_AddParmAtOffset(struct cmd_syndesc *as, int ref, char *aname, int atype,
+                   afs_int32 aflags, char *ahelp)
 {
     struct cmd_parmdesc *tp;
 
@@ -545,7 +569,7 @@ cmd_AddParm(struct cmd_syndesc *as, char *aname, int atype,
     if (as->nParms >= CMD_MAXPARMS)
        return CMD_EXCESSPARMS;
 
-    return cmd_AddParmAtOffset(as, aname, atype, aflags, ahelp, as->nParms++);
+    return cmd_AddParmAtOffset(as, as->nParms++, aname, atype, aflags, ahelp);
 }
 
 int
@@ -747,16 +771,17 @@ initSyntax(void)
        ts = cmd_CreateSyntax("apropos", AproposProc, NULL,
                              "search by help text");
        cmd_AddParm(ts, "-topic", CMD_SINGLE, CMD_REQUIRED, "help string");
-       ts = cmd_CreateSyntax("version", VersionProc, NULL,
-                             (char *)CMD_HIDDEN);
-       ts = cmd_CreateSyntax("-version", VersionProc, NULL,
-                             (char *)CMD_HIDDEN);
-       ts = cmd_CreateSyntax("-help", HelpProc, NULL,
-                             (char *)CMD_HIDDEN);
-       ts = cmd_CreateSyntax("--version", VersionProc, NULL,
-                             (char *)CMD_HIDDEN);
-       ts = cmd_CreateSyntax("--help", HelpProc, NULL,
-                             (char *)CMD_HIDDEN);
+
+       cmd_CreateSyntax("version", VersionProc, NULL,
+                        (char *)CMD_HIDDEN);
+       cmd_CreateSyntax("-version", VersionProc, NULL,
+                        (char *)CMD_HIDDEN);
+       cmd_CreateSyntax("-help", HelpProc, NULL,
+                        (char *)CMD_HIDDEN);
+       cmd_CreateSyntax("--version", VersionProc, NULL,
+                        (char *)CMD_HIDDEN);
+       cmd_CreateSyntax("--help", HelpProc, NULL,
+                        (char *)CMD_HIDDEN);
     }
 }
 
@@ -771,7 +796,6 @@ cmd_Parse(int argc, char **argv, struct cmd_syndesc **outsyntax)
     struct cmd_syndesc *ts = NULL;
     struct cmd_parmdesc *tparm;
     int i;
-    int j = 0;
     int curType;
     int positional;
     int ambig;
@@ -896,6 +920,7 @@ cmd_Parse(int argc, char **argv, struct cmd_syndesc **outsyntax)
         * are considered switches.  This allow negative numbers. */
 
        if ((argv[i][0] == '-') && !isdigit(argv[i][1])) {
+           int j;
 
            /* Find switch */
            if (strrchr(argv[i], '=') != NULL) {
@@ -968,10 +993,17 @@ cmd_Parse(int argc, char **argv, struct cmd_syndesc **outsyntax)
                continue;
            }
 
-           if (ts->parms[j].type != CMD_FLAG) {
-               code = AddItem(tparm, argv[i], pname);
-               if (code)
+           if (tparm->type == CMD_SINGLE ||
+               tparm->type == CMD_SINGLE_OR_FLAG) {
+               if (tparm->items) {
+                   fprintf(stderr, "%sToo many values after switch %s\n",
+                           NName(pname, ": "), tparm->name);
+                   code = CMD_NOTLIST;
                    goto out;
+               }
+               AddItem(tparm, argv[i], pname);        /* Add to end of list */
+           } else if (tparm->type == CMD_LIST) {
+               AddItem(tparm, argv[i], pname);        /* Add to end of list */
            }
 
            /* Now, if we're in positional mode, advance to the next item */
@@ -1232,6 +1264,23 @@ cmd_OptionAsInt(struct cmd_syndesc *syn, int pos, int *value)
 }
 
 int
+cmd_OptionAsUint(struct cmd_syndesc *syn, int pos,
+                unsigned int *value)
+{
+    if (pos > syn->nParms)
+       return CMD_EXCESSPARMS;
+    if (syn->parms[pos].items == NULL ||
+       syn->parms[pos].items->data == NULL)
+       return CMD_MISSING;
+    if (syn->parms[pos].items == &dummy)
+       return 0;
+
+    *value = strtoul(syn->parms[pos].items->data, NULL, 10);
+
+    return 0;
+}
+
+int
 cmd_OptionAsString(struct cmd_syndesc *syn, int pos, char **value)
 {
     if (pos > syn->nParms)