Changeset c4ba74d for cmd.c

Timestamp:

Aug 21, 2008, 12:52:04 AM (16 years ago)

Author:

Nelson Elhage <nelhage@mit.edu>

Branches:

master, debian, release-1.10, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

38a7f22

Parents:

aef51f8

Message:

Make BarnOwl::command() accept a pre-tokenized command.

If given more than one argument, BarnOwl::command now treats the
arguments as an argv list to execute the command with. Previously it
only accepted a single argument, so this should not change the
behavior of any existing code.

File:

• cmd.c (modified) (3 diffs)

cmd.c

@@ -67 +67 @@
 }
 
+char *_owl_cmddict_execute(owl_cmddict *cd, owl_context *ctx, char **argv, int argc, char *buff) {
+  char *retval = NULL;
+  owl_cmd *cmd;
+
+  if (!strcmp(argv[0], "")) {
+  } else if (NULL != (cmd = (owl_cmd*)owl_dict_find_element(cd, argv[0]))) {
+    retval = owl_cmd_execute(cmd, cd, ctx, argc, argv, buff);
+  } else {
+    owl_function_makemsg("Unknown command '%s'.", buff);
+  }
+  return retval;
+}
+
 char *owl_cmddict_execute(owl_cmddict *cd, owl_context *ctx, char *cmdbuff) {
   char **argv;
@@ -72 +85 @@
   char *tmpbuff;
   char *retval = NULL;
-  owl_cmd *cmd;
 
   tmpbuff=owl_strdup(cmdbuff);
@@ -85 +97 @@
   if (argc < 1) return(NULL);
 
-  if (!strcmp(argv[0], "")) {
-  } else if (NULL != (cmd = (owl_cmd*)owl_dict_find_element(cd, argv[0]))) {
-    retval = owl_cmd_execute(cmd, cd, ctx, argc, argv, cmdbuff);
-  } else {
-    owl_function_makemsg("Unknown command '%s'.", cmdbuff);
-  }
+  retval = _owl_cmddict_execute(cd, ctx, argv, argc, cmdbuff);
+
   owl_parsefree(argv, argc);
   owl_free(tmpbuff);
   sepbar(NULL);
+  return retval;
+}
+
+char *owl_cmddict_execute_argv(owl_cmddict *cd, owl_context *ctx, char **argv, int argc) {
+  char *buff, *ptr;
+  int len = 0, i;
+  char *retval = NULL;
+
+  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);
   return retval;
 }