Changes in / [93ee554:34509d5]

Files:

• Makefile.in (modified) (2 diffs)
• commands.c (modified) (11 diffs)
• configure.in (modified) (3 diffs)
• debian/control (modified) (2 diffs)
• dict.c (modified) (2 diffs)
• filter.c (modified) (9 diffs)
• functions.c (modified) (18 diffs)
• global.c (modified) (3 diffs)
• keys.c (modified) (1 diff)
• message.c (modified) (6 diffs)
• obarray.c (modified) (2 diffs)
• owl.c (modified) (12 diffs)
• owl.h (modified) (2 diffs)
• perl/lib/BarnOwl/ModuleLoader.pm (modified) (1 diff)
• perl/modules/Jabber/lib/BarnOwl/Module/Jabber.pm (modified) (6 diffs)
• perl/modules/Jabber/lib/BarnOwl/Module/Jabber/Connection.pm (modified) (2 diffs)
• perl/modules/Jabber/lib/Net/Jabber/MUC.pm (modified) (4 diffs)
• perl/modules/Jabber/lib/XML/Stream.pm (modified) (1 diff)
• perlconfig.c (modified) (6 diffs)
• perlglue.xs (modified) (1 diff)
• perlwrap.pm (modified) (3 diffs)
• t/00-core-tests.t (deleted)
• test.h (modified) (1 diff)
• tester.c (modified) (3 diffs)
• util.c (modified) (4 diffs)
• variable.c (modified) (3 diffs)
• zephyr.c (modified) (2 diffs)
• zwrite.c (modified) (2 diffs)

Makefile.in

@@ -45 +45 @@
 #AUTOGEN=$(GEN_C)
 
-HEADERS=$(GEN_H) owl.h config.h test.h
+HEADERS=$(GEN_H) owl.h config.h
 
 %.o: %.c $(HEADERS)
@@ -127 +127 @@
         ${INSTALL} -d ${DESTDIR}${datadir}/lib
         ${INSTALL} -d ${DESTDIR}${datadir}/modules
-        tar -C perl/lib --exclude .svn -cf - . | tar -C ${DESTDIR}${datadir}/lib -xf -
+        tar -C perl/lib --exclude .svn -c . | tar -C ${DESTDIR}${datadir}/lib -x
         for i in $(PERL_MODULES); do \
                 ${INSTALL_DATA} perl/modules/$$i/$$i.par ${DESTDIR}${datadir}/modules/$$i.par; \

commands.c

@@ -132 +132 @@
   OWLCMD_ARGS("aimwrite", owl_command_aimwrite, OWL_CTX_INTERACTIVE,
               "send an AIM message",
-              "aimwrite <user> [-m <message...>]",
-              "Send an aim message to a user.\n\n" 
-              "The following options are available:\n\n"
-              "-m    Specifies a message to send without prompting.\n"),
+              "aimzwrite <user>",
+              "Send an aim message to a user.\n"),
 
   OWLCMD_ARGS("loopwrite", owl_command_loopwrite, OWL_CTX_INTERACTIVE,
@@ -282 +280 @@
               "suppressed to be received again.\n\n"
               "SEE ALSO:  zpunt, show zpunts\n"),
-
-  OWLCMD_ARGS("punt", owl_command_punt, OWL_CTX_ANY,
-              "suppress an arbitrary filter",
-              "punt <filter-name>",
-              "punt <filter-text (multiple words)>\n"
-              "The punt command will supress message to the specified\n"
-              "filter\n\n"
-              "SEE ALSO:  unpunt, zpunt, show zpunts\n"),
-
-  OWLCMD_ARGS("unpunt", owl_command_unpunt, OWL_CTX_ANY,
-              "remove an entry from the punt list",
-              "zpunt <filter-name>\n"
-              "zpunt <filter-text>\n"
-              "zpunt <number>\n",
-              "The unpunt command will remove an entry from the puntlist.\n"
-              "The first two forms correspond to the first two forms of the :punt\n"
-              "command. The latter allows you to remove a specific entry from the\n"
-              "the list (see :show zpunts)\n\n"
-              "SEE ALSO:  punt, zpunt, zunpunt, show zpunts\n"),
 
   OWLCMD_VOID("info", owl_command_info, OWL_CTX_INTERACTIVE,
@@ -1888 +1867 @@
 char *owl_command_aimwrite(int argc, char **argv, char *buff)
 {
-  char *newbuff, *recip, **myargv;
-  int i, j, myargc;
-  owl_message *m;
+  char *newbuff;
+  int i, j;
   
   if (!owl_global_is_aimloggedin(&g)) {
@@ -1900 +1878 @@
     owl_function_makemsg("Not enough arguments to the aimwrite command.");
     return(NULL);
-  }
-
-  myargv=argv;
-  if (argc<0) {
-    owl_function_error("Unbalanced quotes in aimwrite");
-    return(NULL);
-  }
-  myargc=argc;
-  if (myargc && *(myargv[0])!='-') {
-    myargc--;
-    myargv++;
-  }
-  while (myargc) {
-    if (!strcmp(myargv[0], "-m")) {
-      if (myargc<2) {
-        break;
-      }
-
-      /* Once we have -m, gobble up everything else on the line */
-      myargv++;
-      myargc--;
-      newbuff=owl_malloc(1);
-      newbuff=owl_strdup("");
-      while (myargc) {
-        newbuff=realloc(newbuff, strlen(newbuff)+strlen(myargv[0])+5);
-        strcat(newbuff, myargv[0]);
-        strcat(newbuff, " ");
-        myargc--;
-        myargv++;
-      }
-      newbuff[strlen(newbuff)-1]='\0'; /* remove last space */
-
-      recip=owl_malloc(strlen(argv[0])+5);
-      sprintf(recip, "%s ", argv[1]);
-      owl_aim_send_im(recip, newbuff);
-      m=owl_function_make_outgoing_aim(newbuff, recip);
-      if (m) { 
-          owl_global_messagequeue_addmsg(&g, m);
-      } else {
-          owl_function_error("Could not create outgoing AIM message");
-      }
-
-      owl_free(recip);
-      owl_free(newbuff);
-      return(NULL);
-    } else {
-      /* we don't care */
-      myargv++;
-      myargc--;
-    }
   }
 
@@ -2214 +2142 @@
     char *filename;
     
-    filename=owl_global_get_startupfile(&g);
+    filename=owl_sprintf("%s/%s", owl_global_get_homedir(&g), OWL_STARTUP_FILE);
     owl_function_popless_file(filename);
+    owl_free(filename);
   } else if (!strcmp(argv[1], "errors")) {
     owl_function_showerrs();
@@ -2365 +2294 @@
   return NULL;
 }
+
 
 void owl_command_zpunt_and_zunpunt(int argc, char **argv, int type)
@@ -2415 +2345 @@
 }
 
-char *owl_command_punt(int argc, char **argv, char *buff)
-{
-  owl_command_punt_unpunt(argc, argv, buff, 0);
-  return NULL;
-}
-
-char *owl_command_unpunt(int argc, char **argv, char *buff)
-{
-  owl_command_punt_unpunt(argc, argv, buff, 1);
-  return NULL;
-}
-
-void owl_command_punt_unpunt(int argc, char ** argv, char *buff, int unpunt)
-{
-  owl_list * fl;
-  owl_filter * f;
-  char * text;
-  int i;
-
-  fl = owl_global_get_puntlist(&g);
-  if(argc == 1) {
-    owl_function_show_zpunts();
-  }
-
-  if(argc == 2) {
-    /* Handle :unpunt <number> */
-    if(unpunt && (i=atoi(argv[1])) !=0) {
-      i--;      /* Accept 1-based indexing */
-      if(i < owl_list_get_size(fl)) {
-        f = (owl_filter*)owl_list_get_element(fl, i);
-        owl_list_remove_element(fl, i);
-        owl_filter_free(f);
-        return;
-      } else {
-        owl_function_error("No such filter number: %d", i+1);
-      }
-    }
-    text = owl_sprintf("filter %s", argv[1]);
-  } else {
-    text = skiptokens(buff, 1);
-  }
-
-  owl_function_punt(text, unpunt);
-}
-
-
 char *owl_command_getview(int argc, char **argv, char *buff)
 {
@@ -2585 +2469 @@
   owl_message *m;
   owl_view *v;
-  char *cmd;
 
   v = owl_global_get_current_view(&g);
@@ -2604 +2487 @@
     return;
   }
-  cmd = owl_message_get_attribute_value(m, "yescommand");
+  char * cmd = owl_message_get_attribute_value(m, "yescommand");
   if(!cmd) {
     owl_function_error("No yes command!");
@@ -2619 +2502 @@
   owl_message *m;
   owl_view *v;
-  char *cmd;
 
   v = owl_global_get_current_view(&g);
@@ -2638 +2520 @@
     return;
   }
-  cmd = owl_message_get_attribute_value(m, "nocommand");
+  char * cmd = owl_message_get_attribute_value(m, "nocommand");
   if(!cmd) {
     owl_function_error("No no command!");

configure.in

@@ -33 +33 @@
 
 dnl Check for kerberosIV include
-AC_MSG_CHECKING(for kerberosIV)
+AC_MSG_CHECKING(for /usr/include/kerberosIV)
 if test -d /usr/include/kerberosIV; then
         CFLAGS=${CFLAGS}\ -I/usr/include/kerberosIV
         CPPFLAGS=${CPPFLAGS}\ -I/usr/include/kerberosIV
-        AC_MSG_RESULT(yes)
-elif test -d /usr/local/include/kerberosIV; then
-        CFLAGS=${CFLAGS}\ -I/usr/local/include/kerberosIV
-        CPPFLAGS=${CPPFLAGS}\ -I/usr/local/include/kerberosIV
         AC_MSG_RESULT(yes)
 else
@@ -106 +102 @@
 fi
 
-dnl Add LDFLAGS for embedded perl
+dnl Add LDFLAGS for embeded perl
 FOO=`perl -MExtUtils::Embed -e ldopts`
 echo Adding perl LDFLAGS ${FOO}
@@ -121 +117 @@
 
 dnl Checks for typedefs, structures, and compiler characteristics.
+AC_CHECK_FILE(/usr/share/terminfo, AC_DEFINE(TERMINFO, "/usr/share/terminfo", [Have terminfo]),
+  AC_CHECK_FILE(/usr/share/lib/terminfo, AC_DEFINE(TERMINFO, "/usr/share/lib/terminfo", [Have terminfo]),
+  AC_MSG_ERROR(No terminfo found for this system)))
 
 AC_SUBST(XSUBPPDIR)

debian/control

@@ -3 +3 @@
 Priority: optional
 Maintainer: Sam Hartman <hartmans@debian.org>
-Build-Depends: debhelper (>> 4.0.0), libzephyr-dev (>= 2.1.20010518.SNAPSHOT-7), libncurses5-dev, libkrb5-dev, libperl-dev, zip
+Build-Depends: debhelper (>> 4.0.0), libzephyr-dev (>= 2.1.20010518.SNAPSHOT-7), libncurses5-dev, libkrb5-dev, libperl-dev
 Standards-Version: 3.5.2
 
@@ -12 +12 @@
 Description: A curses-based tty Jabber and Zephyr client.
  An alternative standalone (doesn't use zwgc) Zephyr (instant
- messaging) client.  Also supports AIM and Jabber.
+ messaging) client.  Also supports Jabber.
  Much of the functionality is written in Perl, which is supported as 
  an extension language.
  .
- This is a fork of ktools software's owl Zephyr/AIM client
+ ktools software -- The 'k' is for Quality!

dict.c

@@ -152 +152 @@
   char *av="aval", *bv="bval", *cv="cval", *dv="dval";
 
-  printf("# BEGIN testing owl_dict\n");
+  printf("BEGIN testing owl_dict\n");
   FAIL_UNLESS("create", 0==owl_dict_create(&d));
   FAIL_UNLESS("insert b", 0==owl_dict_insert_element(&d, "b", (void*)bv, owl_dict_noop_free));
@@ -179 +179 @@
   owl_dict_free_all(&d, NULL);
 
-  //  if (numfailed) printf("*** WARNING: failures encountered with owl_dict\n");
-  printf("# END testing owl_dict (%d failures)\n", numfailed);
+  if (numfailed) printf("*** WARNING: failures encountered with owl_dict\n");
+  printf("END testing owl_dict (%d failures)\n", numfailed);
   return(numfailed);
 }

filter.c

@@ -63 +63 @@
 static owl_filterelement * owl_filter_parse_primitive_expression(int argc, char **argv, int *next)
 {
-  owl_filterelement *fe, *op;
+  if(!argc) return NULL;
+
+  owl_filterelement * fe = owl_malloc(sizeof(owl_filterelement));
+  owl_filterelement *op;
+
+  owl_filterelement_create(fe);
   int i = 0, skip;
-
-  if(!argc) return NULL;
-
-  fe = owl_malloc(sizeof(owl_filterelement));
-  owl_filterelement_create(fe);
 
   if(!strcasecmp(argv[i], "(")) {
@@ -118 +118 @@
 {
   int i = 0, skip;
-  owl_filterelement * op1 = NULL, * op2 = NULL, *tmp;
+  owl_filterelement * op1 = NULL, * op2 = NULL;
 
   op1 = owl_filter_parse_primitive_expression(argc-i, argv+i, &skip);
@@ -129 +129 @@
     op2 = owl_filter_parse_primitive_expression(argc-i-1, argv+i+1, &skip);
     if(!op2) goto err;
-    tmp = owl_malloc(sizeof(owl_filterelement));
+    owl_filterelement * tmp = owl_malloc(sizeof(owl_filterelement));
     if(!strcasecmp(argv[i], "and")) {
       owl_filterelement_create_and(tmp, op1, op2);
@@ -204 +204 @@
 int owl_filter_message_match(owl_filter *f, owl_message *m)
 {
-  int ret;
   if(!f->root) return 0;
-  ret = owl_filterelement_match(f->root, m);
+  int ret = owl_filterelement_match(f->root, m);
   if(f->polarity) ret = !ret;
   return ret;
@@ -284 +283 @@
   int failed = 0;
   if(owl_filter_init_fromstring(&f, "test-filter", filt)) {
-    printf("not ok can't parse %s\n", filt);
+    printf("\tFAIL: parse %s\n", filt);
     failed = 1;
     goto out;
@@ -290 +289 @@
   ok = owl_filter_message_match(&f, m);
   if((shouldmatch && !ok) || (!shouldmatch && ok)) {
-    printf("not ok match %s (got %d, expected %d)\n", filt, ok, shouldmatch);
+    printf("\tFAIL: match %s (got %d, expected %d)\n", filt, ok, shouldmatch);
     failed = 1;
   }
@@ -296 +295 @@
   owl_filter_free(&f);
   if(!failed) {
-    printf("ok %s %s\n", shouldmatch ? "matches" : "doesn't match", filt);
+    printf("\tok  : %s %s\n", shouldmatch ? "matches" : "doesn't match", filt);
   }
   return failed;
@@ -306 +305 @@
 
 int owl_filter_regtest(void) {
+  owl_list_create(&(g.filterlist));
   int numfailed=0;
   owl_message m;
-  owl_filter f1, f2, f3, f4;
-
-  owl_list_create(&(g.filterlist));
   owl_message_init(&m);
   owl_message_set_type_zephyr(&m);
@@ -348 +345 @@
   TEST_FILTER("true and false or false", 0);
 
+  owl_filter f1, f2, f3, f4;
+
   owl_filter_init_fromstring(&f1, "f1", "class owl");
   owl_global_add_filter(&g, &f1);

functions.c

@@ -580 +580 @@
 
   if (i>owl_view_get_size(v)-1) i=owl_view_get_size(v)-1;
-  if (i<0) i=0;
 
   if (!found) {
@@ -849 +848 @@
 {
   int ret, ret2;
-  char *foo, *path;
+  char *foo;
 
   if (file==NULL) {
     ret=owl_zephyr_loadsubs(NULL, 0);
   } else {
-    path = owl_util_makepath(file);
-    ret=owl_zephyr_loadsubs(path, 1);
-    free(path);
+    ret=owl_zephyr_loadsubs(file, 1);
   }
 
@@ -2060 +2057 @@
       /* if it's a zephyr we sent, send it out the same way again */
       if (owl_message_is_direction_out(m)) {
-          buff = owl_strdup(owl_message_get_zwriteline(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), OWL_WEBZEPHYR_OPCODE)) {
+        class=OWL_WEBZEPHYR_CLASS;
+        inst=owl_message_get_sender(m);
+        to=OWL_WEBZEPHYR_PRINCIPAL;
+      } else if (!strcasecmp(owl_message_get_class(m), OWL_WEBZEPHYR_CLASS) && owl_message_is_loginout(m)) {
+        /* Special case LOGIN/LOGOUT notifications on class "webzephyr" */
+        class=OWL_WEBZEPHYR_CLASS;
+        inst=owl_message_get_instance(m);
+        to=OWL_WEBZEPHYR_PRINCIPAL;
+      } else if (owl_message_is_loginout(m)) {
+        /* Normal LOGIN/LOGOUT messages */
+        class="MESSAGE";
+        inst="PERSONAL";
+        to=owl_message_get_sender(m);
+      } else if (type==1) {
+        /* Personal reply */
+        class="MESSAGE";
+        inst="PERSONAL";
+        to=owl_message_get_sender(m);
       } else {
-
-        /* Special case a personal reply to a webzephyr user on a class */
-        if ((type==1) && !strcasecmp(owl_message_get_opcode(m), OWL_WEBZEPHYR_OPCODE)) {
-          class=OWL_WEBZEPHYR_CLASS;
-          inst=owl_message_get_sender(m);
-          to=OWL_WEBZEPHYR_PRINCIPAL;
-        } else if (!strcasecmp(owl_message_get_class(m), OWL_WEBZEPHYR_CLASS) && owl_message_is_loginout(m)) {
-          /* Special case LOGIN/LOGOUT notifications on class "webzephyr" */
-          class=OWL_WEBZEPHYR_CLASS;
-          inst=owl_message_get_instance(m);
-          to=OWL_WEBZEPHYR_PRINCIPAL;
-        } else if (owl_message_is_loginout(m)) {
-          /* Normal LOGIN/LOGOUT messages */
-          class="MESSAGE";
-          inst="PERSONAL";
-          to=owl_message_get_sender(m);
-        } else if (type==1) {
-          /* Personal reply */
-          class="MESSAGE";
-          inst="PERSONAL";
-          to=owl_message_get_sender(m);
-        } else {
-          /* General reply */
-          class=owl_message_get_class(m);
-          inst=owl_message_get_instance(m);
-          to=owl_message_get_recipient(m);
-          cc=owl_message_get_cc_without_recipient(m);
-          if (!strcmp(to, "") || !strcmp(to, "*")) {
-            to="";
-          } else if (to[0]=='@') {
-            /* leave it, to get the realm */
-          } else {
-            to=owl_message_get_sender(m);
-          }
-        }
-
-        /* create the command line */
-        if (!strcasecmp(owl_message_get_opcode(m), "CRYPT")) {
-          buff=owl_strdup("zcrypt");
-        } else {
-          buff = owl_strdup("zwrite");
-        }
-        if (strcasecmp(class, "message")) {
-          buff = owl_sprintf("%s -c %s%s%s", oldbuff=buff, owl_getquoting(class), class, owl_getquoting(class));
-          owl_free(oldbuff);
-        }
-        if (strcasecmp(inst, "personal")) {
-          buff = owl_sprintf("%s -i %s%s%s", oldbuff=buff, owl_getquoting(inst), inst, owl_getquoting(inst));
-          owl_free(oldbuff);
-        }
-        if (*to != '\0') {
-          char *tmp, *oldtmp, *tmp2;
-          tmp=short_zuser(to);
-          if (cc) {
-            tmp = owl_util_uniq(oldtmp=tmp, cc, "-");
-            owl_free(oldtmp);
-            buff = owl_sprintf("%s -C %s", oldbuff=buff, tmp);
-            owl_free(oldbuff);
-          } else {
-            if (owl_global_is_smartstrip(&g)) {
-              tmp2=tmp;
-              tmp=owl_zephyr_smartstripped_user(tmp2);
-              owl_free(tmp2);
-            }
-            buff = owl_sprintf("%s %s", oldbuff=buff, tmp);
-            owl_free(oldbuff);
-          }
-          owl_free(tmp);
-        }
-        if (cc) owl_free(cc);
+        /* General reply */
+        class=owl_message_get_class(m);
+        inst=owl_message_get_instance(m);
+        to=owl_message_get_recipient(m);
+        cc=owl_message_get_cc_without_recipient(m);
+        if (!strcmp(to, "") || !strcmp(to, "*")) {
+          to="";
+        } else if (to[0]=='@') {
+          /* leave it, to get the realm */
+        } else {
+          to=owl_message_get_sender(m);
+        }
       }
+        
+      /* create the command line */
+      if (!strcasecmp(owl_message_get_opcode(m), "CRYPT")) {
+        buff=owl_strdup("zcrypt");
+      } else {
+        buff = owl_strdup("zwrite");
+      }
+      if (strcasecmp(class, "message")) {
+        buff = owl_sprintf("%s -c %s%s%s", oldbuff=buff, owl_getquoting(class), class, owl_getquoting(class));
+        owl_free(oldbuff);
+      }
+      if (strcasecmp(inst, "personal")) {
+        buff = owl_sprintf("%s -i %s%s%s", oldbuff=buff, owl_getquoting(inst), inst, owl_getquoting(inst));
+        owl_free(oldbuff);
+      }
+      if (*to != '\0') {
+        char *tmp, *oldtmp, *tmp2;
+        tmp=short_zuser(to);
+        if (cc) {
+          tmp = owl_util_uniq(oldtmp=tmp, cc, "-");
+          owl_free(oldtmp);
+          buff = owl_sprintf("%s -C %s", oldbuff=buff, tmp);
+          owl_free(oldbuff);
+        } else {
+          if (owl_global_is_smartstrip(&g)) {
+            tmp2=tmp;
+            tmp=owl_zephyr_smartstripped_user(tmp2);
+            owl_free(tmp2);
+          }
+          buff = owl_sprintf("%s %s", oldbuff=buff, tmp);
+          owl_free(oldbuff);
+        }
+        owl_free(tmp);
+      }
+      if (cc) owl_free(cc);
     } else if (owl_message_is_type_aim(m)) {
       /* aim */
@@ -2559 +2557 @@
   for (i=0; i<j; i++) {
     f=owl_list_get_element(fl, i);
-    snprintf(buff, sizeof(buff), "[% 2d] ", i+1);
-    owl_fmtext_append_normal(&fm, buff);
     owl_filter_print(f, buff);
     owl_fmtext_append_normal(&fm, buff);
@@ -2626 +2622 @@
   sprintf(argbuff, "class ^(un)*%s(\\.d)*$", tmpclass);
   if (tmpinstance) {
-    sprintf(argbuff, "%s and ( instance ^(un)*%s(\\.d)*$ )", argbuff, tmpinstance);
+    sprintf(argbuff, "%s and ( instance ^%s(\\.d)*$ )", argbuff, tmpinstance);
   }
   owl_free(tmpclass);
@@ -2674 +2670 @@
 
   argbuff=owl_malloc(strlen(longuser)+1000);
-  sprintf(argbuff, "( type ^zephyr$ and filter personal and ");
+  sprintf(argbuff, "( type ^zephyr$ and ( class ^message$ and instance ^personal$ and ");
   sprintf(argbuff, "%s ( ( direction ^in$ and sender ^%s$ ) or ( direction ^out$ and recipient ^%s$ ) ) )", argbuff, longuser, longuser);
-  sprintf(argbuff, "%s or ( ( class ^login$ ) and ( sender ^%s$ ) )", argbuff, longuser);
+  sprintf(argbuff, "%s or ( ( class ^login$ ) and ( sender ^%s$ ) ) )", argbuff, longuser);
 
   owl_filter_init_fromstring(f, filtname, argbuff);
@@ -2804 +2800 @@
   owl_message *m;
   char *zperson, *filtname=NULL;
-  char *argv[1];
   
   v=owl_global_get_current_view(&g);
@@ -2836 +2831 @@
   /* narrow personal and login messages to the sender or recip as appropriate */
   if (owl_message_is_type_zephyr(m)) {
-    if (owl_message_is_personal(m) || owl_message_is_loginout(m)) {
+    if (owl_message_is_private(m) || owl_message_is_loginout(m)) {
       if (owl_message_is_direction_in(m)) {
         zperson=short_zuser(owl_message_get_sender(m));
@@ -2863 +2858 @@
 
   /* pass it off to perl */
+  char *argv[1];
   if(type) {
     argv[0] = "-i";
@@ -3020 +3016 @@
 void owl_function_zpunt(char *class, char *inst, char *recip, int direction)
 {
+  owl_filter *f;
+  owl_list *fl;
   char *buff;
   char *quoted;
-
+  int ret, i, j;
+
+  fl=owl_global_get_puntlist(&g);
+
+  /* first, create the filter */
+  f=owl_malloc(sizeof(owl_filter));
   buff=owl_malloc(strlen(class)+strlen(inst)+strlen(recip)+100);
   strcpy(buff, "class");
@@ -3053 +3056 @@
     owl_free(quoted);
   }
-
-  owl_function_punt(buff, direction);
+  
+  owl_function_debugmsg("About to filter %s", buff);
+  ret=owl_filter_init_fromstring(f, "punt-filter", buff);
   owl_free(buff);
-}
-
-void owl_function_punt(char *filter, int direction)
-{
-  owl_filter *f;
-  owl_list *fl;
-  int ret, i, j;
-  fl=owl_global_get_puntlist(&g);
-
-  /* first, create the filter */
-  f=malloc(sizeof(owl_filter));
-
-  owl_function_debugmsg("About to filter %s", filter);
-  ret=owl_filter_init_fromstring(f, "punt-filter", filter);
   if (ret) {
     owl_function_error("Error creating filter for zpunt");
@@ -3080 +3070 @@
   for (i=0; i<j; i++) {
     if (owl_filter_equiv(f, owl_list_get_element(fl, i))) {
-      owl_function_debugmsg("found an equivalent punt filter");
       /* if we're punting, then just silently bow out on this duplicate */
       if (direction==0) {
@@ -3091 +3080 @@
         owl_filter_free(owl_list_get_element(fl, i));
         owl_list_remove_element(fl, i);
-        owl_filter_free(f);
         return;
       }
@@ -3097 +3085 @@
   }
 
-  owl_function_debugmsg("punting");
   /* If we're punting, add the filter to the global punt list */
   if (direction==0) {
@@ -3474 +3461 @@
   char *filename;
 
-  filename=owl_global_get_startupfile(&g);
+  filename=owl_sprintf("%s/%s", owl_global_get_homedir(&g), OWL_STARTUP_FILE);
   file=fopen(filename, "a");
   if (!file) {
     owl_function_error("Error opening startupfile for new command");
+    owl_free(filename);
     return;
   }
@@ -3483 +3471 @@
   /* delete earlier copies */
   owl_util_file_deleteline(filename, buff, 1);
+  owl_free(filename);
 
   /* add this line */
@@ -3494 +3483 @@
 {
   char *filename;
-  filename=owl_global_get_startupfile(&g);
+  filename=owl_sprintf("%s/%s", owl_global_get_homedir(&g), OWL_STARTUP_FILE);
   owl_util_file_deleteline(filename, buff, 1);
+  owl_free(filename);
 }
 
@@ -3507 +3497 @@
 
   if (!filename) {
-    filename=owl_global_get_startupfile(&g);
+    filename=owl_sprintf("%s/%s", owl_global_get_homedir(&g), OWL_STARTUP_FILE);
     file=fopen(filename, "r");
+    owl_free(filename);
   } else {
     file=fopen(filename, "r");

global.c

@@ -18 +18 @@
   struct hostent *hent;
   char hostname[MAXHOSTNAMELEN];
-  char *cd;
 
   g->malloced=0;
@@ -87 +86 @@
   g->homedir=owl_strdup(getenv("HOME"));
 
-  g->confdir = NULL;
-  g->startupfile = NULL;
-  cd = owl_sprintf("%s/%s", g->homedir, OWL_CONFIG_DIR);
-  owl_global_set_confdir(g, cd);
-  owl_free(cd);
-
   owl_messagelist_create(&(g->msglist));
   owl_mainwin_init(&(g->mw));
@@ -326 +319 @@
 }
 
-char *owl_global_get_confdir(owl_global *g) {
-  if (g->confdir) return(g->confdir);
-  return("/");
-}
-
-/*
- * Setting this also sets startupfile to confdir/startup
- */
-void owl_global_set_confdir(owl_global *g, char *cd) {
-  free(g->confdir);
-  g->confdir = owl_strdup(cd);
-  free(g->startupfile);
-  g->startupfile = owl_sprintf("%s/startup", cd);
-}
-
-char *owl_global_get_startupfile(owl_global *g) {
-  if(g->startupfile) return(g->startupfile);
-  return("/");
-}
-
 int owl_global_get_direction(owl_global *g) {
   return(g->direction);

keys.c

@@ -180 +180 @@
   BIND_CMD("M-<",         "popless:scroll-to-top", "");
 
-  BIND_CMD("END",         "popless:scroll-to-bottom", "");
   BIND_CMD(">",           "popless:scroll-to-bottom", "");
   BIND_CMD("M->",         "popless:scroll-to-bottom", "");

message.c

@@ -27 +27 @@
 owl_fmtext_cache * owl_message_next_fmtext() /*noproto*/
 {
-    owl_fmtext_cache * f = fmtext_cache_next;
     if(fmtext_cache_next->message != NULL) {
         owl_message_invalidate_format(fmtext_cache_next->message);
     }
+    owl_fmtext_cache * f = fmtext_cache_next;
     fmtext_cache_next++;
     if(fmtext_cache_next - fmtext_cache == OWL_FMTEXT_CACHE_SIZE)
@@ -121 +121 @@
     p=owl_list_get_element(&(m->attributes), i);
     buff=owl_sprintf("  %-15.15s: %-35.35s\n", owl_pair_get_key(p), owl_pair_get_value(p));
-    if(buff == NULL) {
-      buff=owl_sprintf("  %-15.15s: %-35.35s\n", owl_pair_get_key(p), "<error>");
-      if(buff == NULL)
-        buff=owl_strdup("   <error>\n");
-    }
     owl_fmtext_append_normal(fm, buff);
     owl_free(buff);
@@ -422 +417 @@
 char *owl_message_get_text(owl_message *m)
 {
-  owl_message_format(m);
   return(owl_fmtext_get_text(&(m->fmtext->fmtext)));
 }
@@ -572 +566 @@
 
 int owl_message_is_answered(owl_message *m) {
-  char *q;
   if(!owl_message_is_question(m)) return 0;
-  q = owl_message_get_attribute_value(m, "question");
+  char * q = owl_message_get_attribute_value(m, "question");
   if(!q) return 0;
   return !strcmp(q, "answered");
@@ -820 +813 @@
   struct hostent *hent;
   char *ptr, *tmp, *tmp2;
-  int len;
 
   owl_message_init(m);
@@ -849 +841 @@
     owl_message_set_opcode(m, "");
   }
-  owl_message_set_zsig(m, owl_zephyr_get_zsig(n, &len));
+  owl_message_set_zsig(m, n->z_message);
 
   if ((ptr=strchr(n->z_recipient, '@'))!=NULL) {

obarray.c

@@ -80 +80 @@
   owl_obarray_init(&oa);
 
-  printf("# BEGIN testing owl_obarray\n");
+  printf("BEGIN testing owl_obarray\n");
 
   p = owl_obarray_insert(&oa, "test");
@@ -96 +96 @@
   FAIL_UNLESS("Didn't find a string that isn't there", p == NULL);
 
-  printf("# END testing owl_obarray (%d failures)\n", numfailed);
+  printf("END testing owl_obarray (%d failures)\n", numfailed);
 
   return numfailed;

owl.c

@@ -65 +65 @@
 owl_global g;
 
-char * owl_get_datadir() {
-    char * datadir = getenv("BARNOWL_DATA_DIR");
-    if(datadir != NULL)
-        return strchr(datadir, '=') + 1;
-    return DATADIR;
-}
-
 int main(int argc, char **argv, char **env)
 {
@@ -81 +74 @@
   struct sigaction sigact;
   char *configfile, *tty, *perlout, *perlerr, **argvsave, buff[LINE], startupmsg[LINE];
-  char *confdir;
   owl_filter *f;
   owl_style *s;
@@ -96 +88 @@
   argvsave=argv;
   configfile=NULL;
-  confdir = NULL;
   tty=NULL;
   debug=0;
@@ -114 +105 @@
     } else if (!strcmp(argv[0], "-c")) {
       if (argc<2) {
-        fprintf(stderr, "Too few arguments to -c\n");
-        usage();
-        exit(1);
+        fprintf(stderr, "Too few arguments to -c\n");
+        usage();
+        exit(1);
       }
       configfile=argv[1];
@@ -123 +114 @@
     } else if (!strcmp(argv[0], "-t")) {
       if (argc<2) {
-        fprintf(stderr, "Too few arguments to -t\n");
-        usage();
-        exit(1);
+        fprintf(stderr, "Too few arguments to -t\n");
+        usage();
+        exit(1);
       }
       tty=argv[1];
-      argv+=2;
-      argc-=2;
-    } else if (!strcmp(argv[0], "-s")){
-      if (argc<2) {
-        fprintf(stderr, "Too few arguments to -s\n");
-        usage();
-        exit(1);
-      }
-      confdir = argv[1];
       argv+=2;
       argc-=2;
@@ -149 +131 @@
       argc--;
     } else if (!strcmp(argv[0], "-v")) {
-      printf("This is barnowl version %s\n", OWL_VERSION_STRING);
+      printf("This is owl version %s\n", OWL_VERSION_STRING);
       exit(0);
     } else {
@@ -181 +163 @@
   /* screen init */
   if (!getenv("TERMINFO")) {
-    owl_function_debugmsg("startup: Not setting TERMINFO");
+    sprintf(buff, "TERMINFO=%s", TERMINFO);
+    putenv(buff);
+    owl_function_debugmsg("startup: setting TERMINFO to %s", TERMINFO);
   } else {
     owl_function_debugmsg("startup: leaving TERMINFO as %s from envrionment", getenv("TERMINFO"));
@@ -211 +195 @@
   /* owl global init */
   owl_global_init(&g);
-  if (debug) owl_global_set_debug_on(&g);
-  if (confdir) owl_global_set_confdir(&g, confdir);
+    if (debug) owl_global_set_debug_on(&g);
   owl_function_debugmsg("startup: first available debugging message");
   owl_global_set_startupargs(&g, argcsave, argvsave);
@@ -234 +217 @@
   /* create the owl directory, in case it does not exist */
   owl_function_debugmsg("startup: creating owl directory, if not present");
-  dir=owl_global_get_confdir(&g);
+  dir=owl_sprintf("%s/%s", owl_global_get_homedir(&g), OWL_CONFIG_DIR);
   mkdir(dir, S_IRWXU);
+  owl_free(dir);
 
   /* set the tty, either from the command line, or by figuring it out */
@@ -279 +263 @@
   owl_function_debugmsg("startup: creating default filters");
   f=owl_malloc(sizeof(owl_filter));
-  owl_filter_init_fromstring(f, "personal", "isprivate ^true$ and ( not type ^zephyr$"
-                             " or ( class ^message and"
-                             " ( instance ^personal$ or instance ^urgent$ ) ) )");
+  owl_filter_init_fromstring(f, "personal", "isprivate ^true$");
   owl_list_append_element(owl_global_get_filterlist(&g), f);
 
@@ -551 +533 @@
     j=wgetch(typwin);
     if (j==ERR) {
-      usleep(10000);
+      usleep(10);
     } else {
       owl_global_update_lastinputtime(&g);
@@ -718 +700 @@
 void usage()
 {
-  fprintf(stderr, "Barnowl version %s\n", OWL_VERSION_STRING);
-  fprintf(stderr, "Usage: barnowl [-n] [-d] [-D] [-v] [-h] [-c <configfile>] [-s <confdir>] [-t <ttyname>]\n");
+  fprintf(stderr, "Owl version %s\n", OWL_VERSION_STRING);
+  fprintf(stderr, "Usage: owl [-n] [-d] [-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, "  -D      enable debugging and delete previous debug file\n");
-  fprintf(stderr, "  -v      print the Barnowl version number and exit\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, "  -s      specify an alternate config dir (default ~/.owl)\n");
   fprintf(stderr, "  -t      set the tty name\n");
 }

owl.h

@@ -64 +64 @@
 #ifdef OWL_PERL
 typedef void WINDOW;
-/* logout is defined in FreeBSD. */
-#define logout logout_
 #include <perl.h>
-#undef logout
 #include "XSUB.h"
 #else
@@ -563 +560 @@
   char *thishost;
   char *homedir;
-  char *confdir;
-  char *startupfile;
   int direction;
   int zaway;

perl/lib/BarnOwl/ModuleLoader.pm

@@ -6 +6 @@
 use lib (BarnOwl::get_data_dir() . "/modules/");
 use PAR (BarnOwl::get_data_dir() . "/modules/*.par");
-use PAR (BarnOwl::get_config_dir() . "/modules/*.par");
+use PAR ($ENV{HOME} . "/.owl/modules/*.par");
 
 sub load_all {
     my %modules;
     my @modules;
-
-    my @moddirs = ();
-    push @moddirs, BarnOwl::get_data_dir() . "/modules";
-    push @moddirs, BarnOwl::get_config_dir() . "/modules";
     
-    for my $dir (@moddirs) {
+    for my $dir ( BarnOwl::get_data_dir() . "/modules",
+                  $ENV{HOME} . "/.owl/modules" ) {
         opendir(my $dh, $dir) or next;
         while(defined(my $f = readdir($dh))) {

perl/modules/Jabber/lib/BarnOwl/Module/Jabber.pm

@@ -581 +581 @@
       or die("Usage: jmuc join MUC [-p password] [-a account]");
 
-    die("Error: Must specify a fully-qualified MUC name (e.g. barnowl\@conference.mit.edu)\n")
-        unless $muc =~ /@/;
     $muc = Net::Jabber::JID->new($muc);
     $jid = Net::Jabber::JID->new($jid);
@@ -588 +586 @@
 
     $conn->getConnectionFromJID($jid)->MUCJoin(JID      => $muc,
-                                               Password => $password,
-                                               History  => {
-                                                   MaxChars => 0
-                                                  });
+                                                  Password => $password,
+                                                  History  => {
+                                                      MaxChars => 0
+                                                     });
     return;
 }
@@ -601 +599 @@
     die("Usage: jmuc part MUC [-a account]") unless $muc;
 
-    if($conn->getConnectionFromJID($jid)->MUCLeave(JID => $muc)) {
-        queue_admin_msg("$jid has left $muc.");
-    } else {
-        die("Error: Not joined to $muc");
-    }
+    $conn->getConnectionFromJID($jid)->MUCLeave(JID => $muc);
+    queue_admin_msg("$jid has left $muc.");
 }
 
@@ -644 +639 @@
     my $m = shift;
     my @jids = $m->Presence();
-
-    my $presence = "JIDs present in " . $m->BaseJID;
-    if($m->Anonymous) {
-        $presence .= " [anonymous MUC]";
-    }
-    $presence .= "\n\t";
-    $presence .= join("\n\t", map {pp_jid($m, $_);} @jids) . "\n";
-    return $presence;
-}
-
-sub pp_jid {
-    my ($m, $jid) = @_;
-    my $nick = $jid->GetResource;
-    my $full = $m->GetFullJID($jid);
-    if($full && $full ne $nick) {
-        return "$nick ($full)";
-    } else {
-        return "$nick";
-    }
+    return "JIDs present in " . $m->BaseJID . "\n\t"
+      . join("\n\t", map {$_->GetResource}@jids) . "\n";
 }
 
@@ -926 +904 @@
                               sid => $sid } );
     $jhash{type} = 'admin';
-    
     BarnOwl::queue_message( BarnOwl::Message->new(%jhash) );
 }
@@ -1157 +1134 @@
     }
     elsif ( $jtype eq 'normal' ) {
-        $props{replycmd}  = "";
+        $props{replycmd}  = undef;
         $props{private} = 1;
     }
     elsif ( $jtype eq 'headline' ) {
-        $props{replycmd} = "";
+        $props{replycmd} = undef;
     }
     elsif ( $jtype eq 'error' ) {
-        $props{replycmd} = "";
+        $props{replycmd} = undef;
         $props{body}     = "Error "
           . $props{error_code}

perl/modules/Jabber/lib/BarnOwl/Module/Jabber/Connection.pm

@@ -52 +52 @@
 Leave a MUC. The MUC is specified in the same form as L</FindMUC>
 
-Returns true if successful, false if this connection was not in the
-named MUC.
-
 =cut
 
@@ -64 +61 @@
     $muc->Leave();
     $self->{_BARNOWL_MUCS} = [grep {$_->BaseJID ne $muc->BaseJID} $self->MUCs];
-    return 1;
 }
 

perl/modules/Jabber/lib/Net/Jabber/MUC.pm

@@ -64 +64 @@
     $self->{JID} = $args{jid};
     $self->{PRESENCE} = { };
-    $self->{ANONYMOUS} = 1;
 
     bless($self, $class);
@@ -189 +188 @@
         delete $self->{PRESENCE}->{$from->GetJID('full')};
     } elsif($type eq 'available') {
-        $self->{PRESENCE}->{$from->GetJID('full')} = {ROOMNICK => $from};
-        my $x = $presence->GetX('http://jabber.org/protocol/muc#user');
-        if($x && $x->DefinedItem()) {
-            my $item = $x->GetItem();
-            if($item->DefinedJID()) {
-                $self->{PRESENCE}->{$from->GetJID('full')}->{FULLJID} = $item->GetJID();
-                $self->{ANONYMOUS} = 0;
-            }
-        }
+        $self->{PRESENCE}->{$from->GetJID('full')} = $from;
     }
 }
@@ -216 +207 @@
 }
 
-=head2 GetFullJID roomjid
-
-Given the roomnick of a user in the MUC, return their full NIC if the
-MUC makes it available. If the MUC is anonymous or the user does not
-exist in the MUC, return undef.
-
-=cut
-
-sub GetFullJID {
-    my $self = shift;
-    my $jid = shift;
-
-    $jid = $jid->GetJID('full') if UNIVERSAL::isa($jid, 'Net::Jabber::JID');
-    my $pres = $self->{PRESENCE}->{$jid};
-    return unless $pres;
-    return $pres->{FULLJID};
-}
-
 =head2 Presence
 
@@ -242 +215 @@
 sub Presence {
     my $self = shift;
-    return map {$_->{ROOMNICK}} values %{$self->{PRESENCE}};
-}
-
-=head2 Anonymous
-
-Returns true if the MUC is anonymous (hides participants real JIDs)
-
-=cut
-
-sub Anonymous {
-    my $self = shift;
-    return $self->{ANONYMOUS};
+    return values %{$self->{PRESENCE}};
 }
 

perl/modules/Jabber/lib/XML/Stream.pm

@@ -1161 +1161 @@
     }
 
-    # 08.04.05(Fri) slipstream@yandex.ru for compapility with ejabberd since it reuses stream id
-    delete($self->{SIDS}->{$currsid}) unless ($currsid eq $sid);
+    delete($self->{SIDS}->{$currsid});
 
     if (exists($self->GetRoot($sid)->{version}) &&

perlconfig.c

@@ -137 +137 @@
   char *key,*val;
   HV * hash;
-  struct tm tm;
 
   hash = (HV*)SvRV(msg);
@@ -163 +162 @@
     } else if (!strcmp(key, "time")) {
       m->timestr = owl_strdup(val);
+      struct tm tm;
       strptime(val, "%a %b %d %T %Y", &tm);
       m->time = mktime(&tm);
@@ -445 +445 @@
   int i, count;
   char * ret = NULL;
-  SV *rv;
   STRLEN n_a;
   dSP;
@@ -468 +467 @@
     if(count != 1)
       croak("Perl command %s returned more than one value!", cmd->name);
-    rv = POPs;
+    SV * rv = POPs;
     if(SvTRUE(rv)) {
       ret = owl_strdup(SvPV(rv, n_a));
@@ -489 +488 @@
   SV *cb = (SV*)(e->cbdata);
   unsigned int n_a;
-  dSP;
-
   if(cb == NULL) {
     owl_function_error("Perl callback is NULL!");
   }
+
+  dSP;
 
   ENTER;
@@ -517 +516 @@
 void owl_perlconfig_mainloop()
 {
-  dSP;
   if (!owl_perlconfig_is_function("BarnOwl::Hooks::_mainloop_hook"))
     return;
+  dSP ;
   PUSHMARK(SP) ;
   call_pv("BarnOwl::Hooks::_mainloop_hook", G_DISCARD|G_EVAL);

perlglue.xs

@@ -199 +199 @@
 get_data_dir ()
         CODE:
-                RETVAL = (char *) owl_get_datadir();
+                RETVAL = (char *) DATADIR;
         OUTPUT:
         RETVAL
-
-char * 
-get_config_dir ()
-        CODE:
-                RETVAL = (char *) owl_global_get_confdir(&g);
-        OUTPUT:
-        RETVAL  
 
 void

perlwrap.pm

@@ -21 +21 @@
 };
 
-use lib(get_data_dir() . "/lib");
-use lib(get_config_dir() . "/lib");
-
-# perlconfig.c will set this to the value of the -c command-line
-# switch, if present.
+use lib(get_data_dir()."/lib");
+use lib($ENV{HOME}."/.owl/lib");
+
 our $configfile;
 
@@ -522 +520 @@
     if ( $m->is_loginout) {
         return format_login($m);
-    } elsif($m->is_ping && $m->is_personal) {
+    } elsif($m->is_ping) {
         return ( "\@b(PING) from \@b(" . $m->pretty_sender . ")\n" );
     } elsif($m->is_admin) {
@@ -570 +568 @@
     }
 
-    if($m->opcode) {
-        $header .= " [" . $m->opcode . "]";
-    }
     $header .= "  " . time_hhmm($m);
     my $sender = $m->long_sender;

test.h

@@ -3 +3 @@
 
 #define FAIL_UNLESS(desc,pred) do { int __pred = (pred);                \
-    printf("%s %s", (__pred)?"ok":(numfailed++,"not ok"), desc);     \
+    printf("\t%-4s: %s", (__pred)?"ok":(numfailed++,"FAIL"), desc);     \
     if(!(__pred)) printf("\t(%s:%d)", __FILE__, __LINE__); printf("%c", '\n'); } while(0)
 

tester.c

@@ -143 +143 @@
 
 
-#define OWL_DICT_NTESTS  20
-#define OWL_UTIL_NTESTS  9
-#define OWL_OBARRAY_NTESTS  5
-#define OWL_VARIABLE_NTESTS  52
-#define OWL_FILTER_NTESTS  23
-
 int main(int argc, char **argv, char **env)
 {
@@ -155 +149 @@
 
   int numfailures=0;
-  if (argc==1 || (argc==2 && 0==strcmp(argv[1],"reg"))) {
-    printf("1..%d\n", OWL_UTIL_NTESTS+OWL_DICT_NTESTS+OWL_VARIABLE_NTESTS
-           +OWL_FILTER_NTESTS+OWL_OBARRAY_NTESTS);
+  if (argc==2 && 0==strcmp(argv[1],"reg")) {
     numfailures += owl_util_regtest();
     numfailures += owl_dict_regtest();
@@ -164 +156 @@
     numfailures += owl_obarray_regtest();
     if (numfailures) {
-      fprintf(stderr, "# *** WARNING: %d failures total\n", numfailures);
+      fprintf(stderr, "*** WARNING: %d failures total\n", numfailures);
     }
     return(numfailures);

util.c

@@ -759 +759 @@
 char * owl_util_baseclass(char * class)
 {
+  char *ret;
   char *start, *end;
 
@@ -768 +769 @@
   start = owl_strdup(start);
   end = start + strlen(start) - 1;
-  while(end > start && *end == 'd' && *(end-1) == '.') {
+  while(*end == 'd' && *(end-1) == '.') {
     end -= 2;
   }
@@ -788 +789 @@
   int numfailed=0;
 
-  printf("# BEGIN testing owl_util\n");
+  printf("BEGIN testing owl_util\n");
 
   FAIL_UNLESS("owl_util_substitute 1",
@@ -811 +812 @@
               !strcmp("meep foo bar", owl_util_uniq("meep foo", "bar foo meep", "-")));
 
-  // if (numfailed) printf("*** WARNING: failures encountered with owl_util\n");
-  printf("# END testing owl_util (%d failures)\n", numfailed);
+  if (numfailed) printf("*** WARNING: failures encountered with owl_util\n");
+  printf("END testing owl_util (%d failures)\n", numfailed);
   return(numfailed);
 }

variable.c

@@ -974 +974 @@
   int numfailed=0;
   char buf[1024];
-  owl_variable * v;
 
   in_regtest = 1;
 
-  printf("# BEGIN testing owl_variable\n");
+  printf("BEGIN testing owl_variable\n");
   FAIL_UNLESS("setup", 0==owl_variable_dict_setup(&vd));
 
@@ -1028 +1027 @@
   FAIL_UNLESS("get enum 10", OWL_WEBBROWSER_NETSCAPE==owl_variable_get_int(&vd,"webbrowser"));
 
+  owl_variable * v;
+  
   owl_variable_dict_newvar_string(&vd, "stringvar", "", "", "testval");
   FAIL_UNLESS("get new string var", NULL != (v = owl_variable_get(&vd, "stringvar", OWL_VARIABLE_STRING)));
@@ -1048 +1049 @@
   owl_variable_dict_free(&vd);
 
-  // if (numfailed) printf("*** WARNING: failures encountered with owl_variable\n");
-  printf("# END testing owl_variable (%d failures)\n", numfailed);
+  if (numfailed) printf("*** WARNING: failures encountered with owl_variable\n");
+  printf("END testing owl_variable (%d failures)\n", numfailed);
   return(numfailed);
 }

zephyr.c

@@ -328 +328 @@
   char *out;
 
-  /* If there's no message here, just run along now */
-  if (n->z_message_len == 0)
-    return(owl_strdup(""));
-
   count=save=0;
   for (i=0; i<n->z_message_len; i++) {
@@ -366 +362 @@
 {
   int i, fields;
-
-  if(n->z_message_len == 0)
-    return 0;
 
   fields=1;

zwrite.c

@@ -125 +125 @@
   }
 
-  if (z->class == NULL &&
-      z->inst == NULL &&
-      owl_list_get_size(&(z->recips))==0) {
-    owl_function_error("You must specify a recipient for zwrite");
-    return(-1);
-  }
-
   /* now deal with defaults */
   if (z->class==NULL) z->class=owl_strdup("message");
@@ -139 +132 @@
   /* z->message is allowed to stay NULL */
   
+  if (!strcasecmp(z->class, "message") &&
+      !strcasecmp(z->inst, "personal") &&
+      owl_list_get_size(&(z->recips))==0) {
+    owl_function_error("You must specify a recipient for zwrite");
+    return(-1);
+  }
+
   /* get a zsig, if not given */
   if (z->zsig==NULL) {