Merge branch 'master' into experimental

Conflicts:
	src/uzbl-core.c

I accidentally merged a pull request into master, getting everything
synced up again.

2 files changed, 11 insertions, 5 deletions

diff --git a/src/util.c b/src/util.c
index 8f6c349..42ae39e 100644
--- a/src/util.c
+++ b/src/util.c
@@ -134,7 +134,7 @@ find_existing_file(const gchar* path_list) {
 
     char *basename = strrchr(path_list_dup, ':');
     if(!basename)
-      return path_list_dup;
+      return file_exists(path_list_dup) ? path_list_dup : NULL;
 
     basename[0] = '\0';
     basename++;
diff --git a/src/uzbl-core.c b/src/uzbl-core.c
index 598abdf..4965d8f 100644
--- a/src/uzbl-core.c
+++ b/src/uzbl-core.c
@@ -553,12 +553,16 @@ split_quoted(const gchar* src, const gboolean unquote) {
 void
 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 (!argv_idx(argv, 0))
+        return;
+
+    const gchar **args = &g_array_index(argv, const gchar *, 1);
+
+    path = find_existing_file(argv_idx(argv, 0));
+    if(path) {
         gchar *r = NULL;
-        run_command(path, arg_cdr, result != NULL, result ? &r : NULL);
+        run_command(path, args, result != NULL, result ? &r : NULL);
         if(result) {
             g_string_assign(result, r);
             // run each line of output from the program as a command
@@ -574,6 +578,8 @@ spawn(GArray *argv, GString *result, gboolean exec) {
         }
         g_free(r);
         g_free(path);
+    } else {
+        g_printerr ("Failed to spawn child process: %s not found\n", argv_idx(argv, 0));
     }
 }