Changes in cmd.c [6a71113:f25df21]

File:

• cmd.c (modified) (1 diff)

cmd.c

@@ -99 +99 @@
 
 char *owl_cmddict_execute_argv(const owl_cmddict *cd, const owl_context *ctx, const char *const *argv, int argc) {
-  char *buff;
-  char *retval = NULL;
-
-  buff = g_strjoinv(" ", (char**)argv);
-  retval = _owl_cmddict_execute(cd, ctx, argv, argc, buff);
-  g_free(buff);
-
+  GString *buf = g_string_new("");
+  int i;
+  char *retval;
+
+  /* We weren't given a command line, so fabricate a valid one. */
+  for(i = 0; i < argc; i++) {
+    if (i != 0)
+      g_string_append_c(buf, ' ');
+    owl_string_append_quoted_arg(buf, argv[i]);
+  }
+
+  retval = _owl_cmddict_execute(cd, ctx, argv, argc, buf->str);
+
+  g_string_free(buf, true);
   return retval;
 }