Changes in commands.c [864ed35:451db9e]

File:

• commands.c (modified) (23 diffs)

commands.c

@@ -51 +51 @@
               "when owl is started and a logout notification is sent when owl\n"
               "is exited.  This behavior can be changed with the 'startuplogin'\n"
-              "and 'shudownlogout' variables.  If a tty is specified for zlog in\n"
+              "and 'shutdownlogout' variables.  If a tty is specified for zlog in\n"
               "then the owl variable 'tty' will be set to that string, causing\n"
               "it to be used as the zephyr location tty.\n"),
@@ -193 +193 @@
   OWLCMD_ARGS("subscribe", owl_command_subscribe, OWL_CTX_ANY,
               "subscribe to a zephyr class, instance, recipient",
-              "subscribe [-t] <class> <instance> [recipient]",
-              "Subscribe the specified class and instance.  If the recipient\n"
-              "is not listed on the command line it defaults\n"
-              "to * (the wildcard recipient).  If the -t option is present\n"
-              "the subscription will only be temporary, i.e., it will not\n"
-              "be written to the subscription file and will therefore not\n"
-              "be present the next time owl is started.\n"),
+              "subscribe [-t] <class> [instance [recipient]]",
+              "Subscribe to the specified class and instance.  If the\n"
+              "instance or recipient is not listed on the command\n"
+              "line they default to * (the wildcard recipient).\n"
+              "If the -t option is present the subscription will\n"
+              "only be temporary, i.e., it will not be written to\n"
+              "the subscription file and will therefore not be\n"
+              "present the next time owl is started.\n"),
   OWLCMD_ALIAS("sub", "subscribe"),
 
   OWLCMD_ARGS("unsubscribe", owl_command_unsubscribe, OWL_CTX_ANY,
               "unsubscribe from a zephyr class, instance, recipient",
-              "unsubscribe [-t] <class> <instance> [recipient]",
+              "unsubscribe [-t] <class> [instance [recipient]]",
               "Unsubscribe from the specified class and instance.  If the\n"
-              "recipient is not listed on the command line it defaults\n"
-              "to * (the wildcard recipient).  If the -t option is present\n"
-              "the unsubscription will only be temporary, i.e., it will not\n"
-              "be updated in the subscription file and will therefore not\n"
-              "be in effect the next time owl is started.\n"),
+              "instance or recipient is not listed on the command\n"
+              "line they default to * (the wildcard recipient).\n"
+              "If the -t option is present the unsubscription will\n"
+              "only be temporary, i.e., it will not be updated in\n"
+              "the subscription file and will therefore not be\n"
+              "in effect the next time owl is started.\n"),
   OWLCMD_ALIAS("unsub", "unsubscribe"),
 
@@ -245 +247 @@
               "delete a buddy from a buddylist",
               "delbuddy <protocol> <screenname>",
-              "Delete the named buddy to your buddylist.  <protocol< can be aim or zephyr\n"),
+              "Delete the named buddy from your buddylist.  <protocol> can be aim or zephyr\n"),
 
   OWLCMD_ARGS("join", owl_command_join, OWL_CTX_INTERACTIVE,
@@ -263 +265 @@
               "zpunt <instance>",
               "The zpunt command will supress message to the specified\n"
-              "zephyr triplet.  In the second usage messages as supressed\n"
+              "zephyr triplet.  In the second usage messages are suppressed\n"
               "for class MESSAGE and the named instance.\n\n"
               "SEE ALSO:  zunpunt, show zpunts\n"),
@@ -271 +273 @@
               "zunpunt <class> <instance> [recipient]\n"
               "zunpunt <instance>",
-              "The zunpunt command will allow messages that were previosly\n"
+              "The zunpunt command will allow messages that were previously\n"
               "suppressed to be received again.\n\n"
               "SEE ALSO:  zpunt, show zpunts\n"),
@@ -545 +547 @@
               "    true\n"
               "    false\n"
-              "Spaces must be present before and after parenthesis.  If the\n"
+              "Spaces must be present before and after parentheses.  If the\n"
               "optional color arguments are used they specifies the colors that\n"
               "messages matching this filter should be displayed in.\n\n"
@@ -592 +594 @@
               "If the curmsg is a personal message narrow\n"
               "   to the conversation with that user.\n"
-              "If the curmsg is a class message, instance foo, recip *\n"
-              "   message, narrow to the class, inst.\n"
-              "If the curmsg is a class message then narrow\n"
+              "If the curmsg is a <MESSAGE, foo, *>\n"
+              "   message, narrow to the instance.\n"
+              "If the curmsg is a class message, narrow\n"
               "    to the class.\n"
-              "If the curmsg is a class message and '-i' is specied\n"
-              "    then narrow to the class, instance\n"),
+              "If the curmsg is a class message and '-i' is specified\n"
+              "    then narrow to the class and instance.\n"),
 
   OWLCMD_ARGS("smartfilter", owl_command_smartfilter, OWL_CTX_INTERACTIVE,
@@ -604 +606 @@
               "If the curmsg is a personal message, the filter is\n"
               "   the conversation with that user.\n"
-              "If the curmsg is a class message, instance foo, recip *\n"
-              "   message, the filter is the class, inst.\n"
+              "If the curmsg is a <MESSAGE, foo, *>\n"
+              "   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"
-              "    the filter is that <class,instance> pair\n"),
+              "    the filter is to that class and instance.\n"),
 
   OWLCMD_ARGS("viewclass", owl_command_viewclass, OWL_CTX_INTERACTIVE,
@@ -674 +676 @@
               "If no message id is specified the current message is marked\n"
               "for deletion.  Otherwise the message with the given message\n"
-              "id is marked for deltion.\n"
+              "id is marked for deletion.\n"
               "If '--no-move' is specified, don't move after deletion.\n"
               "If 'trash' is specified, deletes all trash/auto messages\n"
@@ -688 +690 @@
               "If no message id is specified the current message is\n"
               "unmarked for deletion.  Otherwise the message with the\n"
-              "given message id is marked for undeltion.\n"
+              "given message id is unmarked for deletion.\n"
               "If '--no-move' is specified, don't move after deletion.\n"
               "If 'view' is specified, undeletes all messages\n"
@@ -713 +715 @@
               "getvar <varname>", ""),
 
+  OWLCMD_ARGS("getfilter", owl_command_getfilter, OWL_CTX_INTERACTIVE,
+              "returns the definition of a filter",
+              "getfilter <filtername>", ""),
+
   OWLCMD_ARGS("getstyle", owl_command_getstyle, OWL_CTX_INTERACTIVE,
               "returns the name of the style for the current view",
@@ -723 +729 @@
               "specified string and move the cursor there.  If no string\n"
               "argument is supplied then the previous one is used.  By\n"
-              "default searches are done fowards, if -r is used the search\n"
+              "default searches are done forwards; if -r is used the search\n"
               "is performed backwards"),
 
@@ -732 +738 @@
           "argument and makes it the default argument for future\n"
           "search commands, but does not move the cursor.  With\n"
-          "no argument, it makes search inactive."),
+          "no argument, it makes search highlighting inactive."),
 
   OWLCMD_ARGS("aimlogin", owl_command_aimlogin, OWL_CTX_ANY,
@@ -750 +756 @@
 
   OWLCMD_ARGS("message", owl_command_message, OWL_CTX_ANY,
-              "Display an informatative message",
+              "Display an informative message",
               "message <message>",
               ""),
@@ -1739 +1745 @@
 char *owl_command_subscribe(int argc, char **argv, char *buff)
 {
-  char *recip="";
+  char *class, *instance, *recip="";
   int temp=0;
   int ret=0;
-  
-  if (argc<3) {
+
+  if (argc < 2) {
     owl_function_makemsg("Not enough arguments to the subscribe command");
     return(NULL);
@@ -1755 +1761 @@
     argv++;
   }
-  if (argc<2) {
+  if (argc < 1) {
     owl_function_makemsg("Not enough arguments to the subscribe command");
     return(NULL);
   }
 
-  if (argc>3) {
+  if (argc > 3) {
     owl_function_makemsg("Too many arguments to the subscribe command");
     return(NULL);
   }
 
-  if (argc==2) {
+  class = argv[0];
+
+  if (argc == 1) {
+    instance = "*";
+  } else {
+    instance = argv[1];
+  }
+
+  if (argc <= 2) {
     recip="";
   } else if (argc==3) {
@@ -1771 +1785 @@
   }
 
-  ret = owl_function_subscribe(argv[0], argv[1], recip);
+  ret = owl_function_subscribe(class, instance, recip);
   if (!temp && !ret) {
-    owl_zephyr_addsub(NULL, argv[0], argv[1], recip);
+    owl_zephyr_addsub(NULL, class, instance, recip);
   }
   return(NULL);
@@ -1781 +1795 @@
 char *owl_command_unsubscribe(int argc, char **argv, char *buff)
 {
-  char *recip="";
+  char *class, *instance, *recip="";
   int temp=0;
 
-  if (argc<3) {
+  if (argc < 2) {
     owl_function_makemsg("Not enough arguments to the unsubscribe command");
     return(NULL);
@@ -1796 +1810 @@
     argv++;
   }
-  if (argc<2) {
-    owl_function_makemsg("Not enough arguments to the subscribe command");
-    return(NULL);
-  }
-
-  if (argc>3) {
+  if (argc < 1) {
+    owl_function_makemsg("Not enough arguments to the unsubscribe command");
+    return(NULL);
+  }
+
+  if (argc > 3) {
     owl_function_makemsg("Too many arguments to the unsubscribe command");
     return(NULL);
   }
 
-  if (argc==2) {
+  class = argv[0];
+
+  if (argc == 1) {
+    instance = "*";
+  } else {
+    instance = argv[1];
+  }
+
+  if (argc <= 2) {
     recip="";
   } else if (argc==3) {
@@ -1812 +1834 @@
   }
 
-  owl_function_unsubscribe(argv[0], argv[1], recip);
+  owl_function_unsubscribe(class, instance, recip);
   if (!temp) {
-    owl_zephyr_delsub(NULL, argv[0], argv[1], recip);
+    owl_zephyr_delsub(NULL, class, instance, recip);
   }
   return(NULL);
@@ -2461 +2483 @@
 }
 
+char *owl_command_getfilter(int argc, char **argv, char *buf)
+{
+  owl_filter *f;
+  if (argc != 2) {
+    owl_function_makemsg("Wrong number of arguments for %s", argv[0]);
+    return NULL;
+  }
+  f = owl_global_get_filter(&g, argv[1]);
+  if (!f) {
+    return NULL;
+  }
+  return owl_filter_print(f);
+}
+
 char *owl_command_search(int argc, char **argv, char *buff)
 {
@@ -2580 +2616 @@
   cmd = owl_message_get_attribute_value(m, "yescommand");
   if(!cmd) {
-    owl_function_error("No yes command!");
+    owl_function_error("No 'yes' command!");
     return;
   }
@@ -2614 +2650 @@
   cmd = owl_message_get_attribute_value(m, "nocommand");
   if(!cmd) {
-    owl_function_error("No no command!");
+    owl_function_error("No 'no' command!");
     return;
   }