Changes in cmd.c [4c7c21f:f25df21]

File:

• cmd.c (modified) (3 diffs)

cmd.c

@@ -12 +12 @@
 
 int owl_cmddict_setup(owl_cmddict *cd) {
-  owl_cmddict_init(cd);
+  if (0 != owl_cmddict_init(cd)) return(-1);
   if (0 != owl_cmddict_add_from_list(cd, commands_to_init)) return(-1);
   return(0);
 }
 
-void owl_cmddict_init(owl_cmddict *cd) {
-  owl_dict_create(cd);
+int owl_cmddict_init(owl_cmddict *cd) {
+  if (owl_dict_create(cd)) return(-1);
+  return(0);
 }
 
@@ -98 +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;
 }
@@ -134 +142 @@
 void owl_cmd_cleanup(owl_cmd *cmd)
 {
-  g_free(cmd->name);
-  g_free(cmd->summary);
-  g_free(cmd->usage);
-  g_free(cmd->description);
-  g_free(cmd->cmd_aliased_to);
+  if (cmd->name) g_free(cmd->name);
+  if (cmd->summary) g_free(cmd->summary);
+  if (cmd->usage) g_free(cmd->usage);
+  if (cmd->description) g_free(cmd->description);
+  if (cmd->cmd_aliased_to) g_free(cmd->cmd_aliased_to);
   if (cmd->cmd_perl) owl_perlconfig_cmd_cleanup(cmd);
 }