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: Christophe Gouault <christophe.gouault@6wind.com>

diff --git a/lib/utils.c b/lib/utils.c
index 29b4f548acf39599a472ae454a978788d895ea8c..107e3f5766d384c060947bc46bfad5bb32295dfa 100644 (file)
--- a/lib/utils.c
+++ b/lib/utils.c
@@ -914,12 +914,31 @@ int makeargs(char *line, char *argv[], int maxargs)
        char *cp;
        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)) {
                        fprintf(stderr, "Too many arguments to command\n");
                        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;
+               /* find end of word */
+               cp += strcspn(cp, ws);
+               *cp++ = 0;
        }
        argv[argc] = NULL;