Changes in commands.c [7ba9e0de:987cf3f]

File:

• commands.c (modified) (14 diffs)

commands.c

@@ -106 +106 @@
   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"
@@ -136 +136 @@
               "Send a local message.\n"),
 
-  OWLCMD_ARGS("zcrypt", owl_command_zcrypt, OWL_CTX_INTERACTIVE,
+  OWLCMD_ARGS("zcrypt", owl_command_zwrite, 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"),
@@ -148 +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"
@@ -266 +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"
@@ -283 +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"),
@@ -586 +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"
@@ -594 +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"
@@ -614 +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"),
 
@@ -674 +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"),
   
@@ -743 +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"
@@ -1914 +1914 @@
 char *owl_command_zwrite(int argc, const char *const *argv, const char *buff)
 {
-  owl_zwrite z;
+  owl_zwrite *z;
 
   if (!owl_global_is_havezephyr(&g)) {
@@ -1921 +1921 @@
   }
   /* check for a zwrite -m */
-  owl_zwrite_create_from_line(&z, buff);
-  if (owl_zwrite_is_message_set(&z)) {
-    owl_function_zwrite(buff, NULL);
-    owl_zwrite_cleanup(&z);
-    return (NULL);
-  }
-  owl_zwrite_cleanup(&z);
+  z = owl_zwrite_new(buff);
+  if (!z) {
+    owl_function_error("Error in zwrite arguments");
+    return NULL;
+  }
+
+  if (owl_zwrite_is_message_set(z)) {
+    owl_function_zwrite(z, NULL);
+    owl_zwrite_delete(z);
+    return NULL;
+  }
 
   if (argc < 2) {
+    owl_zwrite_delete(z);
     owl_function_makemsg("Not enough arguments to the zwrite command.");
   } else {
-    owl_function_zwrite_setup(buff);
+    owl_function_zwrite_setup(z);
   }
   return(NULL);
@@ -2022 +2027 @@
 }
 
-char *owl_command_zcrypt(int argc, const char *const *argv, const char *buff)
-{
-  owl_zwrite z;
-
-  if (!owl_global_is_havezephyr(&g)) {
-    owl_function_makemsg("Zephyr is not available");
-    return(NULL);
-  }
-  /* check for a zcrypt -m */
-  owl_zwrite_create_from_line(&z, buff);
-  if (owl_zwrite_is_message_set(&z)) {
-    owl_function_zcrypt(buff, NULL);
-    owl_zwrite_cleanup(&z);
-    return (NULL);
-  }
-  owl_zwrite_cleanup(&z);
-
-  if (argc < 2) {
-    owl_function_makemsg("Not enough arguments to the zcrypt command.");
-  } else {
-    owl_function_zwrite_setup(buff);
-  }
-  return(NULL);
-}
-
 char *owl_command_reply(int argc, const char *const *argv, const char *buff)
 {
@@ -2184 +2164 @@
       argc--;
       argv++;
-    } else if (!strcmp(argv[0], "-r")) {
-      const char *foo;
-      foo=owl_function_create_negative_filter(owl_view_get_filtname(owl_global_get_current_view(&g)));
-      owl_function_change_currentview_filter(foo);
     } else if (!strcmp(argv[0], "-s")) {
       if (argc<2) {