Commit 39e3d383 authored by Christophe Gouault's avatar Christophe Gouault Committed by Stephen Hemminger

batch: support quoted strings

Support quoting strings with " or ' in an iproute2 batch file.

Enables to configure empty crypto keys (for ESP-null) or keys with
spaces:

    xfrm state add src 1.1.1.1 dst 2.2.2.2 proto ah spi 0x1 \
        mode tunnel auth hmac(sha1) "r4ezR/@kd6'749f2 6zf$"

    xfrm state add src 5.5.5.5 dst 2.2.2.2 proto esp spi 0x2 \
        mode tunnel enc cipher_null ""
Signed-off-by: default avatarChristophe Gouault <christophe.gouault@6wind.com>
parent 8aacb9bb
...@@ -914,12 +914,31 @@ int makeargs(char *line, char *argv[], int maxargs) ...@@ -914,12 +914,31 @@ int makeargs(char *line, char *argv[], int maxargs)
char *cp; char *cp;
int argc = 0; int argc = 0;
for (cp = strtok(line, ws); cp; cp = strtok(NULL, ws)) { for (cp = line + strspn(line, ws); *cp; cp += strspn(cp, ws)) {
if (argc >= (maxargs - 1)) { if (argc >= (maxargs - 1)) {
fprintf(stderr, "Too many arguments to command\n"); fprintf(stderr, "Too many arguments to command\n");
exit(1); exit(1);
} }
/* word begins with quote */
if (*cp == '\'' || *cp == '"') {
char quote = *cp++;
argv[argc++] = cp;
/* find ending quote */
cp = strchr(cp, quote);
if (cp == NULL) {
fprintf(stderr, "Unterminated quoted string\n");
exit(1);
}
*cp++ = 0;
continue;
}
argv[argc++] = cp; argv[argc++] = cp;
/* find end of word */
cp += strcspn(cp, ws);
*cp++ = 0;
} }
argv[argc] = NULL; argv[argc] = NULL;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment