cmd: Don't leak memory when constructing help string

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

diff --git a/src/cmd/cmd.c b/src/cmd/cmd.c
index 764b95c..4389adc 100644 (file)
--- a/src/cmd/cmd.c
+++ b/src/cmd/cmd.c
@@ -42,9 +42,8 @@ NName(char *a1, char *a2)
     if (strlen(a1) == 0) {
         return "";
     } else {
-        strncpy(tbuffer, a1, sizeof(tbuffer));
-        strncat(tbuffer, a2, sizeof(tbuffer));
-        tbuffer[sizeof(tbuffer)-1]='\0';
+        strlcpy(tbuffer, a1, sizeof(tbuffer));
+        strlcat(tbuffer, a2, sizeof(tbuffer));
         return tbuffer;
     }
 }
@@ -101,8 +100,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) {
@@ -252,6 +254,7 @@ PrintSyntax(struct cmd_syndesc *as)
               str,
               tp->flags & CMD_OPTIONAL?"]":"");
        free(str);
+       free(name);
        len+=xtralen;
     }
     printf("\n");
@@ -529,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;
 
@@ -566,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
@@ -768,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);
     }
 }
 
@@ -1155,7 +1159,7 @@ CopyBackArgs(struct cmd_token *alist, char **argv,
        argv++;
        count++;
     }
-    *(argv++) = 0;             /* use last slot for terminating null */
+    *argv = NULL;              /* use last slot for terminating null */
     /* don't count terminating null */
     *an = count;
     return 0;
@@ -1260,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)