From: Sébastien Marie <semarie@users.noreply.github.com>
Date: Mon, 20 Oct 2014 11:31:44 +0000 (+0200)
Subject: manage --cmd argument multi-times on commandline
X-Git-Url: https://git.owens.tech/assets/static/git-favicon.png/assets/static/git-favicon.png/git?a=commitdiff_plain;h=33a5e48593eb78fa440cee6e4832bcc7a15e8453;p=vimb.git

manage --cmd argument multi-times on commandline

Allow starting vimb with multiple --cmd arguments on commandline.

- convert vb.config.autocmd to GList
- process all the list at vimb startup
- pass all the list to new process on opening a new target
- cleanup on exit
---

diff --git a/src/main.c b/src/main.c
index 07cfc74..f6e8357 100644
--- a/src/main.c
+++ b/src/main.c
@@ -211,8 +211,15 @@ gboolean vb_load_uri(const Arg *arg)
 
     if (arg->i == VB_TARGET_NEW) {
         guint i = 0;
-        char *cmd[9];
 
+        /* memory allocation */
+        char ** cmd = g_malloc_n(3
+                + (vb.embed ? 2 : 0)
+                + (vb.config.file ? 2 : 0)
+                + g_list_length(vb.config.autocmd) * 2
+                , sizeof(char *));
+
+        /* build commandline */
         cmd[i++] = *args;
         if (vb.embed) {
             char xid[64];
@@ -224,15 +231,18 @@ gboolean vb_load_uri(const Arg *arg)
             cmd[i++] = "-c";
             cmd[i++] = vb.config.file;
         }
-        if (vb.config.autocmd) {
+        for (GList *l = vb.config.autocmd; l; l = l->next) {
             cmd[i++] = "-C";
-            cmd[i++] = vb.config.autocmd;
+            cmd[i++] = l->data;
         }
         cmd[i++] = uri;
         cmd[i++] = NULL;
 
         /* spawn a new browser instance */
         g_spawn_async(NULL, cmd, NULL, G_SPAWN_SEARCH_PATH, NULL, NULL, NULL, NULL);
+
+        /* free commandline */
+        g_free(cmd);
     } else {
         /* Load a web page into the browser instance */
         webkit_web_view_load_uri(vb.gui.webview, uri);
@@ -418,6 +428,8 @@ void vb_quit(gboolean force)
     autocmd_cleanup();
 #endif
 
+    g_list_free_full(vb.config.autocmd, g_free);
+
     for (int i = 0; i < FILES_LAST; i++) {
         g_free(vb.files[i]);
         vb.files[i] = NULL;
@@ -1472,6 +1484,12 @@ static void read_from_stdin(void)
     g_free(buf);
 }
 
+static gboolean autocmdOptionArgFunc(const gchar *option_name, const gchar *value, gpointer data, GError **error)
+{
+    vb.config.autocmd = g_list_append(vb.config.autocmd, g_strdup(value));
+    return TRUE;
+}
+
 int main(int argc, char *argv[])
 {
     static char *winid = NULL;
@@ -1480,7 +1498,7 @@ int main(int argc, char *argv[])
     char *pid;
 
     static GOptionEntry opts[] = {
-        {"cmd", 'C', 0, G_OPTION_ARG_STRING, &vb.config.autocmd, "Ex command run before first page is loaded", NULL},
+        {"cmd", 'C', 0, G_OPTION_ARG_CALLBACK, autocmdOptionArgFunc, "Ex command run before first page is loaded", NULL},
         {"config", 'c', 0, G_OPTION_ARG_STRING, &vb.config.file, "Custom configuration file", NULL},
         {"embed", 'e', 0, G_OPTION_ARG_STRING, &winid, "Reparents to window specified by xid", NULL},
         {"kiosk", 'k', 0, G_OPTION_ARG_NONE, &vb.config.kioskmode, "Run in kiosk mode", NULL},
@@ -1514,8 +1532,8 @@ int main(int argc, char *argv[])
     init_core();
 
     /* process the --cmd if this was given */
-    if (vb.config.autocmd) {
-        ex_run_string(vb.config.autocmd);
+    for (GList *l = vb.config.autocmd; l; l = l->next) {
+        ex_run_string(l->data);
     }
 
     /* open uri given as last argument */
diff --git a/src/main.h b/src/main.h
index 145b7eb..6db48cf 100644
--- a/src/main.h
+++ b/src/main.h
@@ -320,7 +320,7 @@ typedef struct {
     char         *nextpattern;    /* regex patter nfor prev link matching */
     char         *prevpattern;    /* regex patter nfor next link matching */
     char         *file;           /* path to the custome config file */
-    char         *autocmd;        /* command given by --cmd option */
+    GList        *autocmd;        /* list of commands given by --cmd option */
     char         *cafile;         /* path to the ca file */
     GTlsDatabase *tls_db;         /* tls database */
     float        default_zoom;    /* default zoomlevel that is applied on zz zoom reset */