Changeset e3c8332

Timestamp:

Feb 4, 2011, 3:49:44 PM (14 years ago)

Author:

David Benjamin <davidben@mit.edu>

Branches:

master, release-1.10, release-1.8, release-1.9

Children:

4d24650

Parents:

c6b1782

git-author:

David Benjamin <davidben@mit.edu> (01/25/11 00:10:21)

git-committer:

David Benjamin <davidben@mit.edu> (02/04/11 15:49:44)

Message:

Use GString in owl_cmddict_execute_argv

While we're at it, provide a correctly quoted command-line.

File:

• cmd.c (modified) (1 diff)

cmd.c

@@ -110 +110 @@
 
 char *owl_cmddict_execute_argv(const owl_cmddict *cd, const owl_context *ctx, const char *const *argv, int argc) {
-  char *buff, *ptr;
-  int len = 0, i;
-  char *retval = NULL;
-
+  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++) {
-    len += strlen(argv[i]) + 1;
-  }
-
-  ptr = buff = owl_malloc(len);
-
-  for(i = 0; i < argc; i++) {
-    strcpy(ptr, argv[i]);
-    ptr += strlen(argv[i]);
-    *(ptr++) = ' ';
-  }
-  *(ptr - 1) = 0;
-
-  retval = _owl_cmddict_execute(cd, ctx, argv, argc, buff);
-
-  owl_free(buff);
+    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;
 }