Changeset e7cc1c3

Timestamp:

Jun 27, 2003, 1:03:16 PM (21 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:

f562355

Parents:

b278973

Message:

More detailed usage from -h
Special cased replies for webzephyr users on classes and login
  notifications for webzephyr users

Files:

• ChangeLog (modified) (1 diff)
• functions.c (modified) (2 diffs)
• owl.c (modified) (1 diff)
• owl.h (modified) (1 diff)
• util.c (modified) (1 diff)

ChangeLog

@@ -4 +4 @@
         Fix in finding des for building zcrypt
         Fixed description for alert_action variable
+        More detailed usage from -h
+        Special cased replies for webzephyr users on classes and
+          login notifications for webzephyr users
         
 2.0.4

functions.c

@@ -1744 +1744 @@
 
 
+/* if type = 0 then normal reply.
+ * if type = 1 then it's a reply to sender
+ * if enter = 0 then allow the command to be edited
+ * if enter = 1 then don't wait for editing
+ */
 void owl_function_reply(int type, int enter)
 {
-  /* if type = 0 then normal reply.
-   * if type = 1 then it's a reply to sender
-   * if enter = 0 then allow the command to be edited
-   * if enter = 1 then don't wait for editing
-   */
   char *buff, *oldbuff;
   owl_message *m;
@@ -1790 +1790 @@
       }
 
+      /* if it's a zephyr we sent, send it out the same way again */
       if (owl_message_is_direction_out(m)) {
         owl_function_zwrite_setup(owl_message_get_zwriteline(m));
         owl_global_set_buffercommand(&g, owl_message_get_zwriteline(m));
         return;
+      }
+
+      /* Special case a personal reply to a webzephyr user on a class */
+      if ((type==1) && !strcasecmp(owl_message_get_opcode(m), "webzephyr")) {
+        class="webzephyr";
+        inst=owl_message_get_sender(m);
+        to=OWL_WEBZEPHYR_PRINCIPAL;
+      }
+
+      /* Special case LOGIN/LOGOUT notifications on class "webzephyr" */
+      if (!strcasecmp(owl_message_get_class(m), "webzephyr") &&
+          owl_message_is_loginout(m)) {
+        class="webzephyr";
+        inst=owl_message_get_instance(m);
+        to=OWL_WEBZEPHYR_PRINCIPAL;
       }
       

owl.c

@@ -516 +516 @@
 
 void usage() {
-  fprintf(stderr, "Usage: owl [-n] [-d] [-v] [-c <configfile>] [-t <ttyname>]\n");
+  fprintf(stderr, "Owl version %s\n", OWL_VERSION_STRING);
+  fprintf(stderr, "Usage: owl [-n] [-d] [-v] [-h] [-c <configfile>] [-t <ttyname>]\n");
+  fprintf(stderr, "  -n      don't load zephyr subscriptions\n");
+  fprintf(stderr, "  -d      enable debugging\n");
+  fprintf(stderr, "  -v      print the Owl version number and exit\n");
+  fprintf(stderr, "  -h      print this help message\n");
+  fprintf(stderr, "  -c      specify an alternate config file\n");
+  fprintf(stderr, "  -t      set the tty name\n");
+  
 }

owl.h

@@ -122 +122 @@
 
 #define OWL_CMD_ALIAS_SUMMARY_PREFIX "command alias to: "
+
+#define OWL_WEBZEPHYR_PRINCIPAL "daemon.webzephyr"
 
 #if defined(HAVE_DES_STRING_TO_KEY) && defined(HAVE_DES_KEY_SCHED) && defined(HAVE_DES_ECB_ENCRYPT)

util.c

@@ -469 +469 @@
     return(out);
   }
-  if (!strncasecmp(in, "daemon.webzephyr", strlen("daemon.webzephyr"))) {
+  if (!strncasecmp(in, OWL_WEBZEPHYR_PRINCIPAL, strlen(OWL_WEBZEPHYR_PRINCIPAL))) {
     return(out);
   }