Changes in commands.c [14965e5:d544237]

File:

• commands.c (modified) (15 diffs)

commands.c

@@ -92 +92 @@
               "Use 'show keymaps' to see the existing keymaps.\n"
               "Key sequences may be things like M-C-t or NPAGE.\n\n"
-              "Ex.: bindkey recv C-b command zwrite -c barnowl"
-              "SEE ALSO: bindkey"),
+              "Ex.: bindkey recv C-b command zwrite -c barnowl\n"
+              "Ex.: bindkey recv m command start-command zwrite -c my-class -i \n\n"
+              "SEE ALSO: unbindkey, start-command"),
 
   OWLCMD_ARGS("unbindkey", owl_command_unbindkey, OWL_CTX_ANY,
@@ -100 +101 @@
               "Removes a binding of a key sequence within a keymap.\n"
               "Use 'show keymaps' to see the existing keymaps.\n"
-              "Ex.: unbindkey recv H"
+              "Ex.: unbindkey recv H\n\n"
               "SEE ALSO: bindkey"),
 
   OWLCMD_ARGS("zwrite", owl_command_zwrite, OWL_CTX_INTERACTIVE,
               "send a zephyr",
-              "zwrite [-n] [-C] [-c class] [-i instance] [-r realm] [-O opcde] [<user> ...] [-m <message...>]",
+              "zwrite [-n] [-C] [-c class] [-i instance] [-r realm] [-O opcode] [<user> ...] [-m <message...>]",
               "Zwrite send a zephyr to the one or more users specified.\n\n"
               "The following options are available:\n\n"
@@ -137 +138 @@
   OWLCMD_ARGS("zcrypt", owl_command_zcrypt, OWL_CTX_INTERACTIVE,
               "send an encrypted zephyr",
-              "zcrypt [-n] [-C] [-c class] [-i instance] [-r realm] [-O opcde] [-m <message...>]\n",
+              "zcrypt [-n] [-C] [-c class] [-i instance] [-r realm] [-O opcode] [-m <message...>]\n",
               "Behaves like zwrite but uses encryption.  Not for use with\n"
               "personal messages\n"),
@@ -147 +148 @@
               "allow editing.\n\n"
               "If 'sender' is specified, reply to the sender.\n\n"
-              "If 'all' or no args are specified, reply publically to the\n"
+              "If 'all' or no args are specified, reply publicly to the\n"
               "same class/instance for non-personal messages and to the\n"
               "sender for personal messages.\n\n"
@@ -265 +266 @@
               "zpunt <class> <instance> [recipient]\n"
               "zpunt <instance>",
-              "The zpunt command will supress message to the specified\n"
+              "The zpunt command will suppress messages to the specified\n"
               "zephyr triplet.  In the second usage messages are suppressed\n"
               "for class MESSAGE and the named instance.\n\n"
@@ -282 +283 @@
               "punt <filter-text>",
               "punt <filter-text (multiple words)>\n"
-              "The punt command will supress message to the specified\n"
+              "The punt command will suppress messages to the specified\n"
               "filter\n\n"
               "SEE ALSO:  unpunt, zpunt, show zpunts\n"),
@@ -585 +586 @@
               "name style after the -s argument.\n"
               "\n"
-              "The other usages listed above are abbreivated forms that simply set\n"
+              "The other usages listed above are abbreviated forms that simply set\n"
               "the filter of the current view. The -d option allows you to write a\n"
               "filter expression that will be dynamically created by owl and then\n"
@@ -593 +594 @@
   OWLCMD_ARGS("smartnarrow", owl_command_smartnarrow, OWL_CTX_INTERACTIVE,
               "view only messages similar to the current message",
-              "smartnarrow [-i | --instance]  [-r | --relatde]",
+              "smartnarrow [-i | --instance]  [-r | --related]",
               "If the curmsg is a personal message narrow\n"
               "   to the conversation with that user.\n"
@@ -613 +614 @@
               "   message, the filter is to that instance.\n"
               "If the curmsg is a class message, the filter is that class.\n"
-              "If the curmsg is a class message and '-i' is specied\n"
+              "If the curmsg is a class message and '-i' is specified\n"
               "    the filter is to that class and instance.\n"),
 
@@ -673 +674 @@
               "for formatting messages.\n\n"
               "Show variables will list the names of all variables.\n\n"
-              "Show errors will show a list of errors ecountered by Owl.\n\n"
+              "Show errors will show a list of errors encountered by Owl.\n\n"
               "SEE ALSO: filter, view, alias, bindkey, help\n"),
   
@@ -742 +743 @@
               "set the search highlight string without searching",
               "setsearch <string>",
-              "The setsearch command highlights all occurences of its\n"
+              "The setsearch command highlights all occurrences of its\n"
           "argument and makes it the default argument for future\n"
           "search commands, but does not move the cursor.  With\n"
@@ -1294 +1295 @@
   char opt;
   int instance = 0, related = 0, i;
-  char **tmp_argv = owl_malloc(sizeof(char *) * argc);
+  const char **tmp_argv = owl_malloc(sizeof(char *) * argc);
 
   for (i = 0; i < argc; i++)
-    tmp_argv[i] = owl_strdup(argv[i]);
-
-  static struct option options[] = {
+    tmp_argv[i] = argv[i];
+
+  static const struct option options[] = {
     {"instance", 0, 0, 'i'},
     {"related",  0, 0, 'r'},
     {NULL,       0, 0, 0}};
-  while ((opt = getopt_long(argc, tmp_argv, "ir", options, NULL)) != -1) {
+
+  optind = 0;
+  while ((opt = getopt_long(argc, (char **)tmp_argv, "ir", options, NULL)) != -1) {
     switch (opt) {
       case 'i':
@@ -1317 +1320 @@
   }
 
-  for (i = 0; i < argc; i++)
-    owl_free(tmp_argv[i]);
-  owl_free(tmp_argv);
-
   filtname = owl_function_smartfilter(instance, related);
 
@@ -1329 +1328 @@
 
 done:
-  optind = 0; /* reset getopt */
+  owl_free(tmp_argv);
+
   return NULL;
 }
@@ -1608 +1608 @@
 char *owl_command_exec(int argc, const char *const *argv, const char *buff)
 {
-  return owl_function_exec(argc, argv, buff, 0);
+  return owl_function_exec(argc, argv, buff, OWL_OUTPUT_RETURN);
 }
 
 char *owl_command_pexec(int argc, const char *const *argv, const char *buff)
 {
-  return owl_function_exec(argc, argv, buff, 1);
+  return owl_function_exec(argc, argv, buff, OWL_OUTPUT_POPUP);
 }
 
 char *owl_command_aexec(int argc, const char *const *argv, const char *buff)
 {
-  return owl_function_exec(argc, argv, buff, 2);
+  return owl_function_exec(argc, argv, buff, OWL_OUTPUT_ADMINMSG);
 }
 
 char *owl_command_perl(int argc, const char *const *argv, const char *buff)
 {
-  return owl_function_perl(argc, argv, buff, 0);
+  return owl_function_perl(argc, argv, buff, OWL_OUTPUT_RETURN);
 }
 
 char *owl_command_pperl(int argc, const char *const *argv, const char *buff)
 {
-  return owl_function_perl(argc, argv, buff, 1);
+  return owl_function_perl(argc, argv, buff, OWL_OUTPUT_POPUP);
 }
 
 char *owl_command_aperl(int argc, const char *const *argv, const char *buff)
 {
-  return owl_function_perl(argc, argv, buff, 2);
+  return owl_function_perl(argc, argv, buff, OWL_OUTPUT_ADMINMSG);
 }