Merge commit '99961c4' (last_result) into experimental

Conflicts:
	src/cookie-jar.c
	src/uzbl-core.c

3 files changed, 260 insertions, 327 deletions

diff --git a/src/callbacks.c b/src/callbacks.c
index 77b7cb6..546b8ca 100644
--- a/src/callbacks.c
+++ b/src/callbacks.c
@@ -646,23 +646,26 @@ navigation_decision_cb (WebKitWebView *web_view, WebKitWebFrame *frame, WebKitNe
         printf("Navigation requested -> %s\n", uri);
 
     if (uzbl.behave.scheme_handler) {
-        GString *s = g_string_new ("");
-        g_string_printf(s, "'%s'", uri);
+        GString *result = g_string_new ("");
+        GArray *a = g_array_new (TRUE, FALSE, sizeof(gchar*));
+        const CommandInfo *c = parse_command_parts(uzbl.behave.scheme_handler, a);
 
-        run_handler(uzbl.behave.scheme_handler, s->str);
+        if(c) {
+            g_array_append_val(a, uri);
+            run_parsed_command(c, a, result);
+        }
+        g_array_free(a, TRUE);
 
-        if(uzbl.comm.sync_stdout && strcmp (uzbl.comm.sync_stdout, "") != 0) {
-            char *p = strchr(uzbl.comm.sync_stdout, '\n' );
+        if(result->len > 0) {
+            char *p = strchr(result->str, '\n' );
             if ( p != NULL ) *p = '\0';
-            if (!strcmp(uzbl.comm.sync_stdout, "USED")) {
+            if (!strcmp(result->str, "USED")) {
                 webkit_web_policy_decision_ignore(policy_decision);
                 decision_made = TRUE;
             }
         }
-        if (uzbl.comm.sync_stdout)
-            uzbl.comm.sync_stdout = strfree(uzbl.comm.sync_stdout);
 
-        g_string_free(s, TRUE);
+        g_string_free(result, TRUE);
     }
     if (!decision_made)
         webkit_web_policy_decision_use(policy_decision);
@@ -849,27 +852,35 @@ download_cb(WebKitWebView *web_view, WebKitDownload *download, gpointer user_dat
        (this may be inaccurate, there's nothing we can do about that.)  */
     unsigned int total_size = webkit_download_get_total_size(download);
 
-    gchar *ev = g_strdup_printf("'%s' '%s' '%s' %d", uri, suggested_filename,
-                                                     content_type, total_size);
-    run_handler(uzbl.behave.download_handler, ev);
-    g_free(ev);
-
-    /* no response, cancel the download */
-    if(!uzbl.comm.sync_stdout) {
+    GArray *a = g_array_new (TRUE, FALSE, sizeof(gchar*));
+    const CommandInfo *c = parse_command_parts(uzbl.behave.download_handler, a);
+    if(!c) {
         webkit_download_cancel(download);
+        g_array_free(a, TRUE);
         return FALSE;
     }
 
+    g_array_append_val(a, uri);
+    g_array_append_val(a, suggested_filename);
+    g_array_append_val(a, content_type);
+    gchar *total_size_s = g_strdup_printf("%d", total_size);
+    g_array_append_val(a, total_size_s);
+
+    GString *result = g_string_new ("");
+    run_parsed_command(c, a, result);
+
+    g_free(total_size_s);
+    g_array_free(a, TRUE);
+
     /* no response, cancel the download */
-    if(uzbl.comm.sync_stdout[0] == 0) {
+    if(result->len == 0) {
         webkit_download_cancel(download);
-        uzbl.comm.sync_stdout = strfree(uzbl.comm.sync_stdout);
         return FALSE;
     }
 
     /* we got a response, it's the path we should download the file to */
-    gchar *destination_path = uzbl.comm.sync_stdout;
-    uzbl.comm.sync_stdout = NULL;
+    gchar *destination_path = result->str;
+    g_string_free(result, FALSE);
 
     /* presumably people don't need newlines in their filenames. */
     char *p = strchr(destination_path, '\n');
diff --git a/src/uzbl-core.c b/src/uzbl-core.c
index e1f042a..f1426e2 100644
--- a/src/uzbl-core.c
+++ b/src/uzbl-core.c
@@ -144,6 +144,7 @@ const struct var_name_to_ptr_t {
     { "SELECTED_URI",           PTR_C_STR(uzbl.state.selected_url,                   NULL)},
     { "NAME",                   PTR_C_STR(uzbl.state.instance_name,                  NULL)},
     { "PID",                    PTR_C_STR(uzbl.info.pid_str,                         NULL)},
+    { "_",                      PTR_C_STR(uzbl.state.last_result,                    NULL)},
 
     { NULL,                     {.ptr.s = NULL, .type = TYPE_INT, .dump = 0, .writeable = 0, .func = NULL}}
 };
@@ -359,12 +360,6 @@ itos(int val) {
 }
 
 gchar*
-strfree(gchar *str) {
-    g_free(str);
-    return NULL;
-}
-
-gchar*
 argv_idx(const GArray *a, const guint idx) { return g_array_index(a, gchar*, idx); }
 
 /* search a PATH style string for an existing file+path combination */
@@ -570,55 +565,55 @@ VIEWFUNC(go_forward)
 #undef VIEWFUNC
 
 /* -- command to callback/function map for things we cannot attach to any signals */
-struct {const char *key; CommandInfo value;} cmdlist[] =
+CommandInfo cmdlist[] =
 {   /* key                              function      no_split      */
-    { "back",                           {view_go_back, 0}               },
-    { "forward",                        {view_go_forward, 0}            },
-    { "scroll",                         {scroll_cmd, 0}                 },
-    { "reload",                         {view_reload, 0},               },
-    { "reload_ign_cache",               {view_reload_bypass_cache, 0}   },
-    { "stop",                           {view_stop_loading, 0},         },
-    { "zoom_in",                        {view_zoom_in, 0},              }, //Can crash (when max zoom reached?).
-    { "zoom_out",                       {view_zoom_out, 0},             },
-    { "toggle_zoom_type",               {toggle_zoom_type, 0},          },
-    { "uri",                            {load_uri, TRUE}                },
-    { "js",                             {run_js, TRUE}                  },
-    { "script",                         {run_external_js, 0}            },
-    { "toggle_status",                  {toggle_status_cb, 0}           },
-    { "spawn",                          {spawn_async, 0}                },
-    { "sync_spawn",                     {spawn_sync, 0}                 },
-    { "sync_spawn_exec",                {spawn_sync_exec, 0}            }, // needed for load_cookies.sh :(
-    { "sh",                             {spawn_sh_async, 0}             },
-    { "sync_sh",                        {spawn_sh_sync, 0}              },
-    { "exit",                           {close_uzbl, 0}                 },
-    { "search",                         {search_forward_text, TRUE}     },
-    { "search_reverse",                 {search_reverse_text, TRUE}     },
-    { "search_clear",                   {search_clear, TRUE}            },
-    { "dehilight",                      {dehilight, 0}                  },
-    { "set",                            {set_var, TRUE}                 },
-    { "dump_config",                    {act_dump_config, 0}            },
-    { "dump_config_as_events",          {act_dump_config_as_events, 0}  },
-    { "chain",                          {chain, 0}                      },
-    { "print",                          {print, TRUE}                   },
-    { "event",                          {event, TRUE}                   },
-    { "request",                        {event, TRUE}                   },
-    { "menu_add",                       {menu_add, TRUE}                },
-    { "menu_link_add",                  {menu_add_link, TRUE}           },
-    { "menu_image_add",                 {menu_add_image, TRUE}          },
-    { "menu_editable_add",              {menu_add_edit, TRUE}           },
-    { "menu_separator",                 {menu_add_separator, TRUE}      },
-    { "menu_link_separator",            {menu_add_separator_link, TRUE} },
-    { "menu_image_separator",           {menu_add_separator_image, TRUE}},
-    { "menu_editable_separator",        {menu_add_separator_edit, TRUE} },
-    { "menu_remove",                    {menu_remove, TRUE}             },
-    { "menu_link_remove",               {menu_remove_link, TRUE}        },
-    { "menu_image_remove",              {menu_remove_image, TRUE}       },
-    { "menu_editable_remove",           {menu_remove_edit, TRUE}        },
-    { "hardcopy",                       {hardcopy, TRUE}                },
-    { "include",                        {include, TRUE}                 },
-    { "show_inspector",                 {show_inspector, 0}             },
-    { "add_cookie",                     {add_cookie, 0}                 },
-    { "delete_cookie",                  {delete_cookie, 0}              }
+    { "back",                           view_go_back, 0                },
+    { "forward",                        view_go_forward, 0             },
+    { "scroll",                         scroll_cmd, 0                  },
+    { "reload",                         view_reload, 0                 },
+    { "reload_ign_cache",               view_reload_bypass_cache, 0    },
+    { "stop",                           view_stop_loading, 0           },
+    { "zoom_in",                        view_zoom_in, 0                }, //Can crash (when max zoom reached?).
+    { "zoom_out",                       view_zoom_out, 0               },
+    { "toggle_zoom_type",               toggle_zoom_type, 0            },
+    { "uri",                            load_uri, TRUE                 },
+    { "js",                             run_js, TRUE                   },
+    { "script",                         run_external_js, 0             },
+    { "toggle_status",                  toggle_status_cb, 0            },
+    { "spawn",                          spawn_async, 0                 },
+    { "sync_spawn",                     spawn_sync, 0                  },
+    { "sync_spawn_exec",                spawn_sync_exec, 0             }, // needed for load_cookies.sh :(
+    { "sh",                             spawn_sh_async, 0              },
+    { "sync_sh",                        spawn_sh_sync, 0               },
+    { "exit",                           close_uzbl, 0                  },
+    { "search",                         search_forward_text, TRUE      },
+    { "search_reverse",                 search_reverse_text, TRUE      },
+    { "search_clear",                   search_clear, TRUE             },
+    { "dehilight",                      dehilight, 0                   },
+    { "set",                            set_var, TRUE                  },
+    { "dump_config",                    act_dump_config, 0             },
+    { "dump_config_as_events",          act_dump_config_as_events, 0   },
+    { "chain",                          chain, 0                       },
+    { "print",                          print, TRUE                    },
+    { "event",                          event, TRUE                    },
+    { "request",                        event, TRUE                    },
+    { "menu_add",                       menu_add, TRUE                 },
+    { "menu_link_add",                  menu_add_link, TRUE            },
+    { "menu_image_add",                 menu_add_image, TRUE           },
+    { "menu_editable_add",              menu_add_edit, TRUE            },
+    { "menu_separator",                 menu_add_separator, TRUE       },
+    { "menu_link_separator",            menu_add_separator_link, TRUE  },
+    { "menu_image_separator",           menu_add_separator_image, TRUE },
+    { "menu_editable_separator",        menu_add_separator_edit, TRUE  },
+    { "menu_remove",                    menu_remove, TRUE              },
+    { "menu_link_remove",               menu_remove_link, TRUE         },
+    { "menu_image_remove",              menu_remove_image, TRUE        },
+    { "menu_editable_remove",           menu_remove_edit, TRUE         },
+    { "hardcopy",                       hardcopy, TRUE                 },
+    { "include",                        include, TRUE                  },
+    { "show_inspector",                 show_inspector, 0              },
+    { "add_cookie",                     add_cookie, 0                  },
+    { "delete_cookie",                  delete_cookie, 0               }
 };
 
 void
@@ -628,7 +623,7 @@ commands_hash(void)
     uzbl.behave.commands = g_hash_table_new(g_str_hash, g_str_equal);
 
     for (i = 0; i < LENGTH(cmdlist); i++)
-        g_hash_table_insert(uzbl.behave.commands, (gpointer) cmdlist[i].key, &cmdlist[i].value);
+        g_hash_table_insert(uzbl.behave.commands, (gpointer) cmdlist[i].key, &cmdlist[i]);
 }
 
 void
@@ -1117,7 +1112,8 @@ search_clear(WebKitWebView *page, GArray *argv, GString *result) {
     (void) result;
 
     webkit_web_view_unmark_text_matches (page);
-    uzbl.state.searchtx = strfree (uzbl.state.searchtx);
+    g_free(uzbl.state.searchtx);
+    uzbl.state.searchtx = NULL;
 }
 
 void
@@ -1140,16 +1136,21 @@ dehilight (WebKitWebView *page, GArray *argv, GString *result) {
 
 void
 chain (WebKitWebView *page, GArray *argv, GString *result) {
-    (void) page; (void) result;
-    gchar *a = NULL;
-    gchar **parts = NULL;
+    (void) page;
     guint i = 0;
-    while ((a = argv_idx(argv, i++))) {
-        parts = g_strsplit (a, " ", 2);
-        if (parts[0])
-          parse_command(parts[0], parts[1], result);
-        g_strfreev (parts);
+    const gchar *cmd;
+    GString *r = g_string_new ("");
+    while ((cmd = argv_idx(argv, i++))) {
+        GArray *a = g_array_new (TRUE, FALSE, sizeof(gchar*));
+        const CommandInfo *c = parse_command_parts(cmd, a);
+        if (c)
+            run_parsed_command(c, a, r);
+        g_array_free (a, TRUE);
     }
+    if(result)
+        g_string_assign (result, r->str);
+
+    g_string_free(r, TRUE);
 }
 
 void
@@ -1183,7 +1184,8 @@ run_command (const gchar *command, const gchar **args, const gboolean sync,
 
     gboolean result;
     if (sync) {
-        if (*output_stdout) *output_stdout = strfree(*output_stdout);
+        if (*output_stdout)
+            g_free(*output_stdout);
 
         result = g_spawn_sync(NULL, (gchar **)a->data, NULL, G_SPAWN_SEARCH_PATH,
                               NULL, NULL, output_stdout, NULL, NULL, &err);
@@ -1251,25 +1253,28 @@ split_quoted(const gchar* src, const gboolean unquote) {
 }
 
 void
-spawn(GArray *argv, gboolean sync, gboolean exec) {
+spawn(GArray *argv, GString *result, gboolean exec) {
     gchar *path = NULL;
     gchar *arg_car = argv_idx(argv, 0);
     const gchar **arg_cdr = &g_array_index(argv, const gchar *, 1);
 
     if (arg_car && (path = find_existing_file(arg_car))) {
-        if (uzbl.comm.sync_stdout)
-            uzbl.comm.sync_stdout = strfree(uzbl.comm.sync_stdout);
-        run_command(path, arg_cdr, sync, sync?&uzbl.comm.sync_stdout:NULL);
-        // run each line of output from the program as a command
-        if (sync && exec && uzbl.comm.sync_stdout) {
-            gchar *head = uzbl.comm.sync_stdout;
-            gchar *tail;
-            while ((tail = strchr (head, '\n'))) {
-                *tail = '\0';
-                parse_cmd_line(head, NULL);
-                head = tail + 1;
+        gchar *r = NULL;
+        run_command(path, arg_cdr, result != NULL, result ? &r : NULL);
+        if(result) {
+            g_string_assign(result, r);
+            // run each line of output from the program as a command
+            if (exec && r) {
+                gchar *head = r;
+                gchar *tail;
+                while ((tail = strchr (head, '\n'))) {
+                    *tail = '\0';
+                    parse_cmd_line(head, NULL);
+                    head = tail + 1;
+                }
             }
         }
+        g_free(r);
         g_free(path);
     }
 }
@@ -1277,23 +1282,28 @@ spawn(GArray *argv, gboolean sync, gboolean exec) {
 void
 spawn_async(WebKitWebView *web_view, GArray *argv, GString *result) {
     (void)web_view; (void)result;
-    spawn(argv, FALSE, FALSE);
+    spawn(argv, NULL, FALSE);
 }
 
 void
 spawn_sync(WebKitWebView *web_view, GArray *argv, GString *result) {
-    (void)web_view; (void)result;
-    spawn(argv, TRUE, FALSE);
+    (void)web_view;
+    spawn(argv, result, FALSE);
 }
 
 void
 spawn_sync_exec(WebKitWebView *web_view, GArray *argv, GString *result) {
-    (void)web_view; (void)result;
-    spawn(argv, TRUE, TRUE);
+    (void)web_view;
+    if(!result) {
+        GString *force_result = g_string_new("");
+        spawn(argv, force_result, TRUE);
+        g_string_free (force_result, TRUE);
+    } else
+        spawn(argv, result, TRUE);
 }
 
 void
-spawn_sh(GArray *argv, gboolean sync) {
+spawn_sh(GArray *argv, GString *result) {
     if (!uzbl.behave.shell_cmd) {
         g_printerr ("spawn_sh: shell_cmd is not set!\n");
         return;
@@ -1301,19 +1311,23 @@ spawn_sh(GArray *argv, gboolean sync) {
     guint i;
 
     gchar **cmd = split_quoted(uzbl.behave.shell_cmd, TRUE);
+    if(!cmd)
+        return;
+
     gchar *cmdname = g_strdup(cmd[0]);
     g_array_insert_val(argv, 1, cmdname);
 
     for (i = 1; i < g_strv_length(cmd); i++)
         g_array_prepend_val(argv, cmd[i]);
 
-    if (cmd) {
-        if (uzbl.comm.sync_stdout)
-            uzbl.comm.sync_stdout = strfree(uzbl.comm.sync_stdout);
+    if (result) {
+        gchar *r = NULL;
+        run_command(cmd[0], (const gchar **) argv->data, TRUE, &r);
+        g_string_assign(result, r);
+        g_free(r);
+    } else
+        run_command(cmd[0], (const gchar **) argv->data, FALSE, NULL);
 
-        run_command(cmd[0], (const gchar **) argv->data,
-                    sync, sync?&uzbl.comm.sync_stdout:NULL);
-    }
     g_free (cmdname);
     g_strfreev (cmd);
 }
@@ -1321,58 +1335,101 @@ spawn_sh(GArray *argv, gboolean sync) {
 void
 spawn_sh_async(WebKitWebView *web_view, GArray *argv, GString *result) {
     (void)web_view; (void)result;
-    spawn_sh(argv, FALSE);
+    spawn_sh(argv, NULL);
 }
 
 void
 spawn_sh_sync(WebKitWebView *web_view, GArray *argv, GString *result) {
     (void)web_view; (void)result;
-    spawn_sh(argv, TRUE);
+    spawn_sh(argv, result);
 }
 
 void
-parse_command(const char *cmd, const char *param, GString *result) {
-    CommandInfo *c;
-    GString *tmp = g_string_new("");
+run_parsed_command(const CommandInfo *c, GArray *a, GString *result) {
+    c->function(uzbl.gui.web_view, a, result);
 
-    if ((c = g_hash_table_lookup(uzbl.behave.commands, cmd))) {
-            guint i;
-            gchar **par = split_quoted(param, TRUE);
-            GArray *a = g_array_new (TRUE, FALSE, sizeof(gchar*));
+    /* send the COMMAND_EXECUTED event, except for set and event/request commands */
+    if(strcmp("set", c->key)   &&
+       strcmp("event", c->key) &&
+       strcmp("request", c->key)) {
+        GString *tmp = g_string_new(c->key);
+        const gchar *p;
+        guint i = 0;
+        while ((p = argv_idx(a, i++)))
+            g_string_append_printf(tmp, " '%s'", p);
+        send_event(COMMAND_EXECUTED, tmp->str, NULL);
+        g_string_free(tmp, TRUE);
+    }
 
-            if (c->no_split) { /* don't split */
-                sharg_append(a, param);
-            } else if (par) {
-                for (i = 0; i < g_strv_length(par); i++)
-                    sharg_append(a, par[i]);
-            }
+    if(result) {
+        g_free(uzbl.state.last_result);
+        uzbl.state.last_result = g_strdup(result->str);
+    }
+}
 
-            if (result == NULL) {
-                GString *result_print = g_string_new("");
+void
+parse_command_arguments(const gchar *p, GArray *a, gboolean no_split) {
+    if (no_split && p) { /* pass the parameters through in one chunk */
+        sharg_append(a, g_strdup(p));
+        return;
+    }
 
-                c->function(uzbl.gui.web_view, a, result_print);
-                if (result_print->len)
-                    printf("%*s\n", (int)result_print->len, result_print->str);
+    gchar **par = split_quoted(p, TRUE);
+    if (par) {
+        guint i;
+        for (i = 0; i < g_strv_length(par); i++)
+            sharg_append(a, g_strdup(par[i]));
+        g_strfreev (par);
+    }
+}
 
-                g_string_free(result_print, TRUE);
-            } else {
-                c->function(uzbl.gui.web_view, a, result);
-            }
-            g_strfreev (par);
-            g_array_free (a, TRUE);
+const CommandInfo *
+parse_command_parts(const gchar *line, GArray *a) {
+    CommandInfo *c = NULL;
 
-            if(strcmp("set", cmd)     &&
-               strcmp("event", cmd)   &&
-               strcmp("request", cmd)) {
-                g_string_printf(tmp, "%s %s", cmd, param?param:"");
-                send_event(COMMAND_EXECUTED, tmp->str, NULL);
-            }
+    gchar *exp_line = expand(line, 0);
+    if(exp_line[0] == '\0')
+        return NULL;
+
+    /* separate the line into the command and its parameters */
+    gchar **tokens = g_strsplit(exp_line, " ", 2);
+
+    /* look up the command */
+    c = g_hash_table_lookup(uzbl.behave.commands, tokens[0]);
+
+    if(!c) {
+        send_event(COMMAND_ERROR, exp_line, NULL);
+        g_free(exp_line);
+        g_strfreev(tokens);
+        return NULL;
     }
-    else {
-		g_string_printf (tmp, "%s %s", cmd, param?param:"");
-        send_event(COMMAND_ERROR, tmp->str, NULL);
+
+    gchar *p = g_strdup(tokens[1]);
+    g_free(exp_line);
+    g_strfreev(tokens);
+
+    /* parse the arguments */
+    parse_command_arguments(p, a, c->no_split);
+    g_free(p);
+
+    return c;
+}
+
+void
+parse_command(const char *cmd, const char *params, GString *result) {
+    CommandInfo *c = g_hash_table_lookup(uzbl.behave.commands, cmd);
+    if(c) {
+        GArray *a = g_array_new (TRUE, FALSE, sizeof(gchar*));
+
+        parse_command_arguments(params, a, c->no_split);
+        run_parsed_command(c, a, result);
+
+        g_array_free (a, TRUE);
+    } else {
+        gchar *tmp = g_strconcat(cmd, " ", params, NULL);
+        send_event(COMMAND_ERROR, tmp, NULL);
+        g_free(tmp);
     }
-    g_string_free(tmp, TRUE);
 }
 
 
@@ -1466,40 +1523,21 @@ set_var_value(const gchar *name, gchar *val) {
 
 void
 parse_cmd_line(const char *ctl_line, GString *result) {
-    size_t len=0;
-    gchar *ctlstrip = NULL;
-    gchar *exp_line = NULL;
-    gchar *work_string = NULL;
+    gchar *work_string = g_strdup(ctl_line);
 
-    work_string = g_strdup(ctl_line);
+    /* strip trailing newline, and any other whitespace in front */
+    g_strstrip(work_string);
 
-    /* strip trailing newline */
-    len = strlen(ctl_line);
-    if (work_string[len - 1] == '\n')
-        ctlstrip = g_strndup(work_string, len - 1);
-    else
-        ctlstrip = g_strdup(work_string);
-    g_free(work_string);
-
-    if( strcmp(g_strchug(ctlstrip), "") &&
-        strcmp(exp_line = expand(ctlstrip, 0), "")
-      ) {
-            /* ignore comments */
-            if((exp_line[0] == '#'))
-                ;
-
-            /* parse a command */
-            else {
-                gchar **tokens = NULL;
-
-                tokens = g_strsplit(exp_line, " ", 2);
-                parse_command(tokens[0], tokens[1], result);
-                g_strfreev(tokens);
-            }
-        g_free(exp_line);
+    if( strcmp(work_string, "") ) {
+        if((work_string[0] != '#')) { /* ignore comments */
+            GArray *a = g_array_new (TRUE, FALSE, sizeof(gchar*));
+            const CommandInfo *c = parse_command_parts(work_string, a);
+            run_parsed_command(c, a, result);
+            g_array_free (a, TRUE);
+        }
     }
 
-    g_free(ctlstrip);
+    g_free(work_string);
 }
 
 /*@null@*/ gchar*
@@ -1960,126 +1998,6 @@ create_plug () {
     return plug;
 }
 
-
-gchar**
-inject_handler_args(const gchar *actname, const gchar *origargs, const gchar *newargs) {
-    /*
-      If actname is one that calls an external command, this function will inject
-      newargs in front of the user-provided args in that command line.  They will
-      come become after the body of the script (in sh) or after the name of
-      the command to execute (in spawn).
-      i.e. sh <body> <userargs> becomes sh <body> <ARGS> <userargs> and
-      spawn <command> <userargs> becomes spawn <command> <ARGS> <userargs>.
-
-      The return value consist of two strings: the action (sh, ...) and its args.
-
-      If act is not one that calls an external command, then the given action merely
-      gets duplicated.
-    */
-    GArray *rets = g_array_new(TRUE, FALSE, sizeof(gchar*));
-    /* Arrr! Here be memory leaks */
-    gchar *actdup = g_strdup(actname);
-    g_array_append_val(rets, actdup);
-
-    if ((g_strcmp0(actname, "spawn") == 0) ||
-        (g_strcmp0(actname, "sh") == 0) ||
-        (g_strcmp0(actname, "sync_spawn") == 0) ||
-        (g_strcmp0(actname, "sync_sh") == 0)) {
-        guint i;
-        GString *a = g_string_new("");
-        gchar **spawnparts = split_quoted(origargs, FALSE);
-        g_string_append_printf(a, "%s", spawnparts[0]); /* sh body or script name */
-        if (newargs) g_string_append_printf(a, " %s", newargs); /* handler args */
-
-        for (i = 1; i < g_strv_length(spawnparts); i++) /* user args */
-            if (spawnparts[i]) g_string_append_printf(a, " %s", spawnparts[i]);
-
-        g_array_append_val(rets, a->str);
-        g_string_free(a, FALSE);
-        g_strfreev(spawnparts);
-    } else {
-        gchar *origdup = g_strdup(origargs);
-        g_array_append_val(rets, origdup);
-    }
-    return (gchar**)g_array_free(rets, FALSE);
-}
-
-void
-run_handler (const gchar *act, const gchar *args) {
-    /* Consider this code a temporary hack to make the handlers usable.
-       In practice, all this splicing, injection, and reconstruction is
-       inefficient, annoying and hard to manage.  Potential pitfalls arise
-       when the handler specific args 1) are not quoted  (the handler
-       callbacks should take care of this)  2) are quoted but interfere
-       with the users' own quotation.  A more ideal solution is
-       to refactor parse_command so that it doesn't just take a string
-       and execute it; rather than that, we should have a function which
-       returns the argument vector parsed from the string.  This vector
-       could be modified (e.g. insert additional args into it) before
-       passing it to the next function that actually executes it.  Though
-       it still isn't perfect for chain actions..  will reconsider & re-
-       factor when I have the time. -duc */
-
-    if (!act) return;
-    char **parts = g_strsplit(act, " ", 2);
-    if (!parts || !parts[0]) return;
-    if (g_strcmp0(parts[0], "chain") == 0) {
-        GString *newargs = g_string_new("");
-        gchar **chainparts = split_quoted(parts[1], FALSE);
-
-        /* for every argument in the chain, inject the handler args
-           and make sure the new parts are wrapped in quotes */
-        gchar **cp = chainparts;
-        gchar quot = '\'';
-        gchar *quotless = NULL;
-        gchar **spliced_quotless = NULL; // sigh -_-;
-        gchar **inpart = NULL;
-
-        while (*cp) {
-            if ((**cp == '\'') || (**cp == '\"')) { /* strip old quotes */
-                quot = **cp;
-                quotless = g_strndup(&(*cp)[1], strlen(*cp) - 2);
-            } else quotless = g_strdup(*cp);
-
-            spliced_quotless = g_strsplit(quotless, " ", 2);
-            inpart = inject_handler_args(spliced_quotless[0], spliced_quotless[1], args);
-            g_strfreev(spliced_quotless);
-
-            g_string_append_printf(newargs, " %c%s %s%c", quot, inpart[0], inpart[1], quot);
-            g_free(quotless);
-            g_strfreev(inpart);
-            cp++;
-        }
-
-        parse_command(parts[0], &(newargs->str[1]), NULL);
-        g_string_free(newargs, TRUE);
-        g_strfreev(chainparts);
-
-    } else {
-        gchar **inparts;
-        gchar *inparts_[2];
-        if (parts[1]) {
-            /* expand the user-specified arguments */
-            gchar* expanded = expand(parts[1], 0);
-            inparts = inject_handler_args(parts[0], expanded, args);
-            g_free(expanded);
-        } else {
-            inparts_[0] = parts[0];
-            inparts_[1] = g_strdup(args);
-            inparts = inparts_;
-        }
-
-        parse_command(inparts[0], inparts[1], NULL);
-
-        if (inparts != inparts_) {
-            g_free(inparts[0]);
-            g_free(inparts[1]);
-        } else
-            g_free(inparts[1]);
-    }
-    g_strfreev(parts);
-}
-
 void
 settings_init () {
     State *s = &uzbl.state;
@@ -2120,32 +2038,34 @@ void handle_authentication (SoupSession *session, SoupMessage *msg, SoupAuth *au
     (void) user_data;
 
     if(uzbl.behave.authentication_handler && *uzbl.behave.authentication_handler != 0) {
-        gchar *info, *host, *realm;
-        gchar *p;
-
         soup_session_pause_message(session, msg);
 
-        /* Sanitize strings */
-            info  = g_strdup(soup_auth_get_info(auth));
-            host  = g_strdup(soup_auth_get_host(auth));
-            realm = g_strdup(soup_auth_get_realm(auth));
-            for (p = info; *p; p++)  if (*p == '\'') *p = '\"';
-            for (p = host; *p; p++)  if (*p == '\'') *p = '\"';
-            for (p = realm; *p; p++) if (*p == '\'') *p = '\"';
+        GString *result = g_string_new ("");
 
-        GString *s = g_string_new ("");
-        g_string_printf(s, "'%s' '%s' '%s' '%s'",
-            info, host, realm, retrying?"TRUE":"FALSE");
+        gchar *info  = g_strdup(soup_auth_get_info(auth));
+        gchar *host  = g_strdup(soup_auth_get_host(auth));
+        gchar *realm = g_strdup(soup_auth_get_realm(auth));
 
-        run_handler(uzbl.behave.authentication_handler, s->str);
+        GArray *a = g_array_new (TRUE, FALSE, sizeof(gchar*));
+        const CommandInfo *c = parse_command_parts(uzbl.behave.authentication_handler, a);
+        if(c) {
+            sharg_append(a, info);
+            sharg_append(a, host);
+            sharg_append(a, realm);
+            sharg_append(a, retrying ? "TRUE" : "FALSE");
 
-        if (uzbl.comm.sync_stdout && strcmp (uzbl.comm.sync_stdout, "") != 0) {
+            run_parsed_command(c, a, result);
+        }
+        g_array_free(a, TRUE);
+
+        if (result->len > 0) {
             char  *username, *password;
             int    number_of_endls=0;
 
-            username = uzbl.comm.sync_stdout;
+            username = result->str;
 
-            for (p = uzbl.comm.sync_stdout; *p; p++) {
+            gchar *p;
+            for (p = result->str; *p; p++) {
                 if (*p == '\n') {
                     *p = '\0';
                     if (++number_of_endls == 1)
@@ -2159,12 +2079,9 @@ void handle_authentication (SoupSession *session, SoupMessage *msg, SoupAuth *au
                 soup_auth_authenticate(auth, username, password);
         }
 
-        if (uzbl.comm.sync_stdout)
-            uzbl.comm.sync_stdout = strfree(uzbl.comm.sync_stdout);
-
         soup_session_unpause_message(session, msg);
 
-        g_string_free(s, TRUE);
+        g_string_free(result, TRUE);
         g_free(info);
         g_free(host);
         g_free(realm);
@@ -2275,7 +2192,8 @@ initialize(int argc, char *argv[]) {
 
     uzbl.state.executable_path = g_strdup(argv[0]);
     uzbl.state.selected_url = NULL;
-    uzbl.state.searchtx = NULL;
+    uzbl.state.searchtx     = NULL;
+    uzbl.state.last_result  = NULL;
 
     GOptionContext* context = g_option_context_new ("[ uri ] - load a uri by default");
     g_option_context_add_main_entries (context, entries, NULL);
diff --git a/src/uzbl-core.h b/src/uzbl-core.h
index b58c8fe..28092b4 100644
--- a/src/uzbl-core.h
+++ b/src/uzbl-core.h
@@ -87,7 +87,6 @@ typedef struct {
     /* stores (key)"variable name" -> (value)"pointer to var*/
     GHashTable     *proto_var;
 
-    gchar          *sync_stdout;
     GPtrArray      *connect_chan;
     GPtrArray      *client_chan;
 } Communication;
@@ -102,7 +101,8 @@ typedef struct {
     gchar    *selected_url;
     gchar    *last_selected_url;
     gchar    *executable_path;
-    gchar*   searchtx;
+    gchar   *searchtx;
+    gchar   *last_result;
     gboolean verbose;
     gboolean events_stdout;
     GPtrArray *event_buffer;
@@ -239,9 +239,6 @@ typedef struct {
 char *
 itos(int val);
 
-gchar*
-strfree(gchar *str);
-
 void
 clean_up(void);
 
@@ -346,9 +343,6 @@ GtkPlug*
 create_plug ();
 
 void
-run_handler (const gchar *act, const gchar *args);
-
-void
 settings_init ();
 
 void
@@ -482,10 +476,20 @@ builtins();
 typedef void (*Command)(WebKitWebView*, GArray *argv, GString *result);
 
 typedef struct {
-    Command function;
-    gboolean no_split;
+    const gchar *key;
+    Command      function;
+    gboolean     no_split;
 } CommandInfo;
 
+const CommandInfo *
+parse_command_parts(const gchar *line, GArray *a);
+
+void
+parse_command_arguments(const gchar *p, GArray *a, gboolean no_split);
+
+void
+run_parsed_command(const CommandInfo *c, GArray *a, GString *result);
+
 typedef struct {
     gchar *name;
     gchar *cmd;