Changeset bde7714 for commands.c

Timestamp:

Sep 22, 2002, 3:20:00 PM (22 years ago)

Author:

James M. Kretchmar <kretch@mit.edu>

Branches:

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

Children:

5a6e6b9

Parents:

f9c43ae

Message:

Started updating the intro document
Small changes to help / about
The 'subscribe' and 'unsubscribe' commands (and their aliases)
  update .zephyr.subs by default.  If either is given the '-t'
  (for "temporary") option the .zephyr.subs will not be updated

File:

• commands.c (modified) (5 diffs)

commands.c

@@ -132 +132 @@
   OWLCMD_ARGS("subscribe", owl_command_subscribe, OWL_CTX_ANY,
               "subscribe to a zephyr class, instance, recipient",
-              "subscribe <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).\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"),
   OWLCMD_ALIAS("sub", "subscribe"),
 
   OWLCMD_ARGS("unsubscribe", owl_command_unsubscribe, OWL_CTX_ANY,
               "unsubscribe from a zephyr class, instance, recipient",
-              "unsubscribe <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).\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"),
   OWLCMD_ALIAS("unsub", "unsubscribe"),
 
@@ -724 +730 @@
 }
 
-char *owl_command_zlist(int argc, char **argv) {
+char *owl_command_zlist(int argc, char **argv, char *buff) {
   int elapsed=0, timesort=0;
   char *file=NULL;
@@ -1131 +1137 @@
 char *owl_command_subscribe(int argc, char **argv, char *buff) {
   char *recip="";
-
+  int temp=0;
+  
   if (argc<3) {
     owl_function_makemsg("Not enough arguments to the subscribe command");
-    return NULL;
-  } else if (argc>4) {
+    return(NULL);
+  }
+  argc--;
+  argv++;
+
+  if (!strcmp(argv[0], "-t")) {
+    temp=1;
+    argc--;
+    argv++;
+  }
+  if (argc<2) {
+    owl_function_makemsg("Not enough arguments to the subscribe command");
+    return(NULL);
+  }
+
+  if (argc>3) {
     owl_function_makemsg("Too many arguments to the subscribe command");
-    return NULL;
-  }
-
-  if (argc==3) {
+    return(NULL);
+  }
+
+  if (argc==2) {
     recip="";
-  } else if (argc==4) {
-    recip=argv[3];
-  }
-
-  owl_function_subscribe(argv[1], argv[2], recip);
-  return NULL;
+  } else if (argc==3) {
+    recip=argv[2];
+  }
+
+  owl_function_subscribe(argv[0], argv[1], recip);
+  if (!temp) {
+    owl_zephyr_addsub(NULL, argv[0], argv[1], recip);
+  }
+  return(NULL);
 }
 
@@ -1153 +1177 @@
 char *owl_command_unsubscribe(int argc, char **argv, char *buff) {
   char *recip="";
+  int temp=0;
 
   if (argc<3) {
     owl_function_makemsg("Not enough arguments to the unsubscribe command");
-    return NULL;
-  } else if (argc>4) {
+    return(NULL);
+  }
+  argc--;
+  argv++;
+
+  if (!strcmp(argv[0], "-t")) {
+    temp=1;
+    argc--;
+    argv++;
+  }
+  if (argc<2) {
+    owl_function_makemsg("Not enough arguments to the subscribe command");
+    return(NULL);
+  }
+
+  if (argc>3) {
     owl_function_makemsg("Too many arguments to the unsubscribe command");
-    return NULL;
-  }
-
-  if (argc==3) {
+    return(NULL);
+  }
+
+  if (argc==2) {
     recip="";
-  } else if (argc==4) {
-    recip=argv[3];
-  }
-
-  owl_function_unsubscribe(argv[1], argv[2], recip);
-  return NULL;
+  } else if (argc==3) {
+    recip=argv[2];
+  }
+
+  owl_function_unsubscribe(argv[0], argv[1], recip);
+  if (!temp) {
+    owl_zephyr_delsub(NULL, argv[0], argv[1], recip);
+  }
+  return(NULL);
 }
 
@@ -1675 +1717 @@
   owl_global_set_needrefresh(&g);
 }
-