parse & store command line as argc+argv

diff --git a/include/rumprun-base/config.h b/include/rumprun-base/config.h
index 76301b0c22e60015ca1e2859cf13c4d48b2d0819..024e229a45d91a5a49c02db398f11c8d0b59a77a 100644 (file)
--- a/include/rumprun-base/config.h
+++ b/include/rumprun-base/config.h
@@ -26,6 +26,9 @@
 #ifndef _BMKCOMMON_RUMPRUN_CONFIG_H_
 #define _BMKCOMMON_RUMPRUN_CONFIG_H_
 
+extern int rumprun_cmdline_argc;
+extern char **rumprun_cmdline_argv;
+
 void _rumprun_config(const char *);
 void _rumprun_deconfig(void);
 

diff --git a/platform/baremetal/rumpconfig.c b/platform/baremetal/rumpconfig.c
index 32937e9702767a13b01b93f9f3d787140528bf9c..e468d24a50d381d7bafbb3512e646a4e3b71f9e4 100644 (file)
--- a/platform/baremetal/rumpconfig.c
+++ b/platform/baremetal/rumpconfig.c
@@ -35,6 +35,7 @@
 #include <ufs/ufs/ufsmount.h>
 #include <isofs/cd9660/cd9660_mount.h>
 
+#include <assert.h>
 #include <err.h>
 #include <fcntl.h>
 #include <stdio.h>
@@ -45,6 +46,7 @@
 #include <rump/netconfig.h>
 
 #include <rumprun-base/config.h>
+#include <rumprun-base/parseargs.h>
 
 #include <bmk-core/jsmn.h>
 
@@ -77,12 +79,44 @@
        }                                                               \
   } while (/*CONSTCOND*/0)
 
+int rumprun_cmdline_argc;
+char **rumprun_cmdline_argv;
+
+static void
+makeargv(char *argvstr)
+{
+       char **argv;
+       int nargs;
+
+       assert(rumprun_cmdline_argc == 0 && rumprun_cmdline_argv == NULL);
+
+       rumprun_parseargs(argvstr, &nargs, 0);
+       argv = malloc(sizeof(*argv) * (nargs+2));
+       if (argv == NULL)
+               errx(1, "could not allocate argv");
+
+       rumprun_parseargs(argvstr, &nargs, argv);
+       argv[nargs] = argv[nargs+1] = '\0';
+       rumprun_cmdline_argv = argv;
+       rumprun_cmdline_argc = nargs;
+}
+
 static int
 handle_cmdline(jsmntok_t *t, int left, const char *data)
 {
+       char *argvstr;
+       size_t argvstrlen;
 
        T_CHECKTYPE(t, data, JSMN_STRING, __func__);
-       printf("command line is: %.*s\n", T_PRINTFSTAR(t, data));
+
+       /* allocate memory for argv element storage */
+       argvstrlen = T_SIZE(t)+1;
+       argvstr = malloc(argvstrlen);
+       if (argvstr == NULL)
+               errx(1, "could not allocate argv storage");
+
+       T_STRCPY(argvstr, argvstrlen, t, data);
+       makeargv(argvstr);
 
        return 1;
 }
@@ -275,6 +309,7 @@ _rumprun_config(const char *cmdline)
        while (*cmdline != '{') {
                if (*cmdline == '\0') {
                        warnx("could not find start of json.  no config?");
+                       makeargv("rumprun");
                        return;
                }
                cmdline++;