Changeset 6a71113

Timestamp:

Mar 28, 2011, 9:11:12 AM (14 years ago)

Author:

David Benjamin <davidben@mit.edu>

Branches:

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

Children:

0b20de4, 4fd211f

Parents:

f203cad

git-author:

David Benjamin <davidben@mit.edu> (03/28/11 09:01:16)

git-committer:

David Benjamin <davidben@mit.edu> (03/28/11 09:11:12)

Message:

Use g_strjoinv in owl_cmddict_execute_argv, don't quote correctly

This reverts commit e3c8332fa85642544dba1222912b77cf6e32ce8c and uses
g_strjoinv instead. The correctly quoted form caused the j keybinding in
BarnOwl::Jabber to break. Without it, the world isn't sane this way
either:

  :perl BarnOwl::bindkey(recv => 'C-f C-f' => command => 'recv:next')

But a solution to this will probably be far more complex and bear little
relation to this commit. In the meantime master really shouldn't have
this obnoxious of a regression on it.

Files:

• cmd.c (modified) (1 diff)
• perlglue.xs (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) {
-  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);
+  char *buff;
+  char *retval = NULL;
+
+  buff = g_strjoinv(" ", (char**)argv);
+  retval = _owl_cmddict_execute(cd, ctx, argv, argc, buff);
+  g_free(buff);
+
   return retval;
 }

perlglue.xs

@@ -43 +43 @@
                         rv = owl_function_command(cmd);
                 } else {
-                        argv = g_new(const char *, items + 1);
+                        /* Ensure this is NULL-terminated. */
+                        argv = g_new0(const char *, items + 1);
                         argv[0] = cmd;
                         for(i = 1; i < items; i++) {