Changeset 2367f1c

Timestamp:

Jul 9, 2011, 4:00:41 PM (14 years ago)

Author:

GitHub Merge Button <merge-button@github.com>

Parents:

a16d7e5 (diff), 37ac344 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge 37ac3443e4be8b822ab13b34901c88bcb8ed375f into a16d7e5b1281bf21e0fe52b6d9946fd58893da28

Files:

• runtests.sh (modified) (1 diff)
• tester.c (modified) (4 diffs)
• util.c (modified) (1 diff)
• commands.c (modified) (10 diffs)
• filterelement.c (modified) (1 diff)
• functions.c (modified) (3 diffs)
• help.c (modified) (4 diffs)
• variable.c (modified) (9 diffs)

runtests.sh

@@ -5 +5 @@
 export BARNOWL_BIN_DIR="$SRCDIR/"
 
-HARNESS_PERL=./tester exec prove t/
+HARNESS_PERL=./tester exec prove --failures t/

tester.c

@@ -4 +4 @@
 #undef WINDOW
 
+#include <errno.h>
 #include <unistd.h>
+#include <pwd.h>
+#include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
+#include <sys/types.h>
 
 #undef instr
@@ -124 +129 @@
 #define FAIL_UNLESS(desc,pred) do { int __pred = (pred);                \
     numtests++;                                                         \
-    printf("%s %s", (__pred)?"ok":(numfailed++,"not ok"), desc);        \
+    printf("%s %d %s", (__pred) ? "ok" : (numfailed++, "not ok"), numtests, desc); \
     if(!(__pred)) printf("\t(%s:%d)", __FILE__, __LINE__); printf("%c", '\n'); } while(0)
 
@@ -131 +136 @@
 {
   int numfailed=0;
+  const char *home;
+  char *s, *path;
+  struct passwd *pw;
 
   printf("# BEGIN testing owl_util\n");
@@ -225 +233 @@
   g_string_free(g, true);
 
+
+  s = owl_util_baseclass("barnowl");
+  FAIL_UNLESS("baseclass barnowl", !strcmp("barnowl", s));
+  g_free(s);
+  s = owl_util_baseclass("unbarnowl");
+  FAIL_UNLESS("baseclass unbarnowl", !strcmp("barnowl", s));
+  g_free(s);
+  s = owl_util_baseclass("unununbarnowl.d.d");
+  FAIL_UNLESS("baseclass unununbarnowl.d.d", !strcmp("barnowl", s));
+  g_free(s);
+  s = owl_util_baseclass("ununun.d.d");
+  FAIL_UNLESS("baseclass ununun.d.d", !strcmp("", s));
+  g_free(s);
+  s = owl_util_baseclass("d.d.d.d");
+  FAIL_UNLESS("baseclass d.d.d.d", !strcmp("d", s));
+  g_free(s);
+  s = owl_util_baseclass("n.d.d.d");
+  FAIL_UNLESS("baseclass n.d.d.d", !strcmp("n", s));
+  g_free(s);
+  s = owl_util_baseclass("ununun.");
+  FAIL_UNLESS("baseclass ununun.", !strcmp(".", s));
+  g_free(s);
+  s = owl_util_baseclass("unununu");
+  FAIL_UNLESS("baseclass unununu", !strcmp("u", s));
+  g_free(s);
+
+
+  s = owl_util_makepath("foo/bar");
+  FAIL_UNLESS("makepath foo/bar", !strcmp("foo/bar", s));
+  g_free(s);
+  s = owl_util_makepath("//foo///bar");
+  FAIL_UNLESS("makepath //foo///bar", !strcmp("/foo/bar", s));
+  g_free(s);
+  s = owl_util_makepath("foo/~//bar/");
+  FAIL_UNLESS("makepath foo/~//bar/", !strcmp("foo/~/bar/", s));
+  g_free(s);
+  s = owl_util_makepath("~thisuserhadreallybetternotexist/foobar/");
+  FAIL_UNLESS("makepath ~thisuserhadreallybetternotexist/foobar/",
+              !strcmp("~thisuserhadreallybetternotexist/foobar/", s));
+  g_free(s);
+
+  errno = 0;
+  pw = getpwuid(getuid());
+  if (pw) {
+    home = pw->pw_dir;
+  } else {
+    /* Just make some noise so we notice. */
+    home = "<WHAT>";
+    fprintf(stderr, "getpwuid: %s", errno ? strerror(errno) : "No such user");
+  }
+  s = owl_util_makepath("~");
+  FAIL_UNLESS("makepath ~", !strcmp(home, s));
+  g_free(s);
+
+  path = g_strconcat(home, "/foo/bar/baz", NULL);
+  s = owl_util_makepath("~///foo/bar//baz");
+  FAIL_UNLESS("makepath ~///foo/bar//baz", !strcmp(path, s));
+  g_free(s);
+  g_free(path);
+
+  errno = 0;
+  pw = getpwnam("root");
+  if (pw) {
+    home = pw->pw_dir;
+  } else {
+    /* Just make some noise so we notice. */
+    home = "<WHAT>";
+    fprintf(stderr, "getpwnam: %s", errno ? strerror(errno) : "No such user");
+  }
+
+  s = owl_util_makepath("~root");
+  FAIL_UNLESS("makepath ~root", !strcmp(home, s));
+  g_free(s);
+
+  path = g_strconcat(home, "/foo/bar/baz", NULL);
+  s = owl_util_makepath("~root///foo/bar//baz");
+  FAIL_UNLESS("makepath ~root///foo/bar//baz", !strcmp(path, s));
+  g_free(s);
+  g_free(path);
+
   /* if (numfailed) printf("*** WARNING: failures encountered with owl_util\n"); */
   printf("# END testing owl_util (%d failures)\n", numfailed);

util.c

@@ -37 +37 @@
 CALLER_OWN char *owl_util_makepath(const char *in)
 {
-  int i, j, x;
-  char *out, user[MAXPATHLEN];
-  struct passwd *pw;
-
-  out=g_new(char, MAXPATHLEN+1);
-  out[0]='\0';
-  j=strlen(in);
-  x=0;
-  for (i=0; i<j; i++) {
-    if (in[i]=='~') {
-      if ( (i==(j-1)) ||          /* last character */
-           (in[i+1]=='/') ) {     /* ~/ */
-        /* use my homedir */
-        pw=getpwuid(getuid());
-        if (!pw) {
-          out[x]=in[i];
-        } else {
-          out[x]='\0';
-          strcat(out, pw->pw_dir);
-          x+=strlen(pw->pw_dir);
-        }
-      } else {
-        /* another user homedir */
-        int a, b;
-        b=0;
-        for (a=i+1; i<j; a++) {
-          if (in[a]==' ' || in[a]=='/') {
-            break;
-          } else {
-            user[b]=in[a];
-            i++;
-            b++;
-          }
-        }
-        user[b]='\0';
-        pw=getpwnam(user);
-        if (!pw) {
-          out[x]=in[i];
-        } else {
-          out[x]='\0';
-          strcat(out, pw->pw_dir);
-          x+=strlen(pw->pw_dir);
-        }
-      }
-    } else if (in[i]=='/') {
-      /* check for a double / */
-      if (i<(j-1) && (in[i+1]=='/')) {
-        /* do nothing */
-      } else {
-        out[x]=in[i];
-        x++;
-      }
+  char *out;
+  int i, j;
+  if (in[0] == '~') {
+    /* Attempt tilde-expansion of the first component. Get the
+       tilde-prefix, which goes up to the next slash. */
+    struct passwd *pw;
+    const char *end = strchr(in + 1, '/');
+    if (end == NULL)
+      end = in + strlen(in);
+
+    if (end == in + 1) {
+      /* My home directory. */
+      pw = getpwuid(getuid());
     } else {
-      out[x]=in[i];
-      x++;
-    }
-  }
-  out[x]='\0';
-  return(out);
+      /* Someone else's home directory. */
+      char *user = g_strndup(in + 1, end - (in + 1));
+      pw = getpwnam(user);
+      g_free(user);
+    }
+
+    /* Patch together a new path. Replace the ~ and tilde-prefix with
+       the homedir. */
+    if (pw) {
+      out = g_strconcat(pw->pw_dir, end, NULL);
+    } else {
+      out = g_strdup(in);
+    }
+  } else {
+      out = g_strdup(in);
+  }
+
+  /* And a quick pass to remove duplicate slashes. */
+  for (i = j = 0; out[i] != '\0'; i++) {
+    if (out[i] != '/' || i == 0 || out[i-1] != '/')
+      out[j++] = out[i];
+  }
+  out[j] = '\0';
+  return out;
 }
 

commands.c

@@ -50 +50 @@
               "zlog in will send a login notification, zlog out will send a\n"
               "logout notification.  By default a login notification is sent\n"
-              "when owl is started and a logout notification is sent when owl\n"
+              "when BarnOwl is started and a logout notification is sent when owl\n"
               "is exited.  This behavior can be changed with the 'startuplogin'\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"
+              "then the BarnOwl variable 'tty' will be set to that string, causing\n"
               "it to be used as the zephyr location tty.\n"),
 
   OWLCMD_VOID("quit", owl_command_quit, OWL_CTX_ANY,
-              "exit owl",
+              "exit BarnOwl",
               "",
-              "Exit owl and run any shutdown activities."),
+              "Exit BarnOwl and run any shutdown activities."),
   OWLCMD_ALIAS("exit", "quit"),
   OWLCMD_ALIAS("q",    "quit"),
@@ -180 +180 @@
 
   OWLCMD_ARGS("startup", owl_command_startup, OWL_CTX_ANY,
-              "run a command and set it to be run at every Owl startup",
+              "run a command and set it to be run at every BarnOwl startup",
               "startup <commands> ...",
               "Everything on the command line after the startup command\n"
-              "is executed as a normal owl command and is also placed in\n"
-              "a file so that the command is executed every time owl\n"
+              "is executed as a normal BarnOwl command and is also placed in\n"
+              "a file so that the command is executed every time BarnOwl\n"
               "is started"),
 
   OWLCMD_ARGS("unstartup", owl_command_unstartup, OWL_CTX_ANY,
-              "remove a command from the list of those to be run at Owl startup",
+              "remove a command from the list of those to be run at BarnOwl startup",
               "unstartup <commands> ...",
               ""),
 
   OWLCMD_VOID("version", owl_command_version, OWL_CTX_ANY,
-              "print the version of the running owl", "", ""),
+              "print the version of the running BarnOwl", "", ""),
 
   OWLCMD_ARGS("subscribe", owl_command_subscribe, OWL_CTX_ANY,
@@ -204 +204 @@
               "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"),
+              "present the next time BarnOwl is started.\n"),
   OWLCMD_ALIAS("sub", "subscribe"),
 
@@ -216 +216 @@
               "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"),
+              "in effect the next time BarnOwl is started.\n"),
   OWLCMD_ALIAS("unsub", "unsubscribe"),
 
@@ -234 +234 @@
 
   OWLCMD_ARGS("source", owl_command_source, OWL_CTX_ANY,
-              "execute owl commands from a file",
+              "execute BarnOwl commands from a file",
               "source <filename>",
-              "Execute the owl commands in <filename>.\n"),
+              "Execute the BarnOwl commands in <filename>.\n"),
 
   OWLCMD_ARGS("aim", owl_command_aim, OWL_CTX_INTERACTIVE,
@@ -305 +305 @@
   
   OWLCMD_ARGS("help", owl_command_help, OWL_CTX_INTERACTIVE,
-              "display help on using owl",
+              "display help on using BarnOwl",
               "help [command]", ""),
 
@@ -418 +418 @@
 
   OWLCMD_VOID("suspend", owl_command_suspend, OWL_CTX_ANY,
-              "suspend owl", "", ""),
+              "suspend BarnOwl", "", ""),
 
   OWLCMD_ARGS("echo", owl_command_echo, OWL_CTX_ANY,
@@ -509 +509 @@
 
   OWLCMD_VOID("about", owl_command_about, OWL_CTX_INTERACTIVE,
-              "print information about owl", "", ""),
+              "print information about BarnOwl", "", ""),
 
   OWLCMD_VOID("status", owl_command_status, OWL_CTX_ANY,
-              "print status information about the running owl", "", ""),
+              "print status information about the running BarnOwl", "", ""),
   
   OWLCMD_ARGS("zlocate", owl_command_zlocate, OWL_CTX_INTERACTIVE,
@@ -590 +590 @@
               "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"
+              "filter expression that will be dynamically created by BarnOwl and then\n"
               "applied as the view's filter\n"
               "SEE ALSO: filter, viewclass, viewuser\n"),
@@ -676 +676 @@
               "for formatting messages.\n\n"
               "Show variables will list the names of all variables.\n\n"
-              "Show errors will show a list of errors encountered by Owl.\n\n"
+              "Show errors will show a list of errors encountered by BarnOwl.\n\n"
               "SEE ALSO: filter, view, alias, bindkey, help\n"),
   

filterelement.c

@@ -104 +104 @@
 }
 
-/* XXX: Our boolea operators short-circuit here. The original owl did
+/* XXX: Our boolean operators short-circuit here. The original owl did
    not. Do we care?
 */

functions.c

@@ -144 +144 @@
     "\n"
     "   * Redistributions in any form must be accompanied by information on\n"
-    "     how to obtain complete source code for the Owl software and any\n"
-    "     accompanying software that uses the Owl software. The source code\n"
+    "     how to obtain complete source code for the BarnOwl software and any\n"
+    "     accompanying software that uses the BarnOwl software. The source code\n"
     "     must either be included in the distribution or be available for no\n"
     "     more than the cost of distribution plus a nominal fee, and must be\n"
@@ -972 +972 @@
   }
 
-  owl_function_debugmsg("Quitting Owl");
+  owl_function_debugmsg("Quitting BarnOwl");
   owl_select_quit_loop();
 }
@@ -1439 +1439 @@
   }
 
-  owl_fmtext_append_bold(&fm, "\nOwl Message Attributes:\n");
+  owl_fmtext_append_bold(&fm, "\nBarnOwl Message Attributes:\n");
   owl_message_attributes_tofmtext(m, &attrfm);
   owl_fmtext_append_fmtext(&fm, &attrfm);

help.c

@@ -70 +70 @@
      "    w             Open a URL in the current message\n"
      "    C-l           Refresh the screen\n"
-     "    C-z           Suspend Owl\n"
+     "    C-z           Suspend BarnOwl\n"
      "    h             Print this help message\n"
      "    : , M-x       Enter command mode\n"
@@ -84 +84 @@
   owl_fmtext_append_normal
     (&fm, 
-     "    quit, exit    Exit owl\n"
+     "    quit, exit    Exit BarnOwl\n"
      "    help          Get help about commands\n"
-     "    show          Show information about owl (see detailed help)\n"
+     "    show          Show information about BarnOwl (see detailed help)\n"
      "\n"
      "    zwrite        Send a zephyr\n"
@@ -102 +102 @@
      "    set           Set a variable (see list below)\n"
      "    print         Print a variable's value (variables listed below)\n"
-     "    startup       Set a command to be run at every Owl startup\n"
-     "    unstartup     Remove a command to be run at every Owl startup\n"
+     "    startup       Set a command to be run at every BarnOwl startup\n"
+     "    unstartup     Remove a command to be run at every BarnOwl startup\n"
      "\n"
      "    getsubs       Print a list of current subscriptions\n"
@@ -122 +122 @@
      "    dump          Dump messagelist as text to a file\n"
      "\n"
-     "    about         Print information about owl\n"
-     "    status        Print status information about the running owl\n"
-     "    version       Print the version number of owl\n"
+     "    about         Print information about BarnOwl\n"
+     "    status        Print status information about the running BarnOwl\n"
+     "    version       Print the version number of BarnOwl\n"
      "\n");
   

variable.c

@@ -70 +70 @@
 
   OWLVAR_BOOL( "startuplogin" /* %OwlVarStub */, 1,
-               "send a login message when owl starts", "" ),
+               "send a login message when BarnOwl starts", "" ),
 
   OWLVAR_BOOL( "shutdownlogout" /* %OwlVarStub */, 1,
-               "send a logout message when owl exits", "" ),
+               "send a logout message when BarnOwl exits", "" ),
 
   OWLVAR_BOOL( "rxping" /* %OwlVarStub */, 0,
@@ -137 +137 @@
   OWLVAR_BOOL_FULL( "pseudologins" /* %OwlVarStub */, 0,
                     "Enable zephyr pseudo logins",
-                    "When this is enabled, Owl will periodically check the zephyr\n"
+                    "When this is enabled, BarnOwl will periodically check the zephyr\n"
                     "location of users in your .anyone file.  If a user is present\n"
                     "but sent no login message, or a user is not present that sent no\n"
@@ -145 +145 @@
   OWLVAR_BOOL( "ignorelogins" /* %OwlVarStub */, 0,
                "Enable printing of login notifications",
-               "When this is enabled, Owl will print login and logout notifications\n"
-               "for AIM, zephyr, or other protocols.  If disabled Owl will not print\n"
+               "When this is enabled, BarnOwl will print login and logout notifications\n"
+               "for AIM, zephyr, or other protocols.  If disabled BarnOwl will not print\n"
                "login or logout notifications.\n"),
 
@@ -160 +160 @@
   OWLVAR_BOOL( "loglogins" /* %OwlVarStub */, 0,
                "Enable logging of login notifications",
-               "When this is enabled, Owl will login login and logout notifications\n"
+               "When this is enabled, BarnOwl will log login and logout notifications\n"
                "for AIM, zephyr, or other protocols.  If disabled Owl will not print\n"
                "login or logout notifications.\n"),
@@ -201 +201 @@
   OWLVAR_PATH( "newmsgproc" /* %OwlVarStub:newmsgproc */, NULL,
                "name of a program to run when new messages are present",
-               "The named program will be run when owl receives new\n"
+               "The named program will be run when BarnOwl receives new\n"
                "messages.  It will not be run again until the first\n"
                "instance exits"),
@@ -229 +229 @@
                  "string to append to the end of the sepbar",
                  "The sepbar is the bar separating the top and bottom\n"
-                 "of the owl screen.  Any string specified here will\n"
+                 "of the BarnOwl screen.  Any string specified here will\n"
                  "be displayed on the right of the sepbar\n"),
 
@@ -265 +265 @@
 
   OWLVAR_STRING( "alert_action" /* %OwlVarStub */, "nop",
-                 "owl command to execute for alert actions",
+                 "BarnOwl command to execute for alert actions",
                  "" ),
 
@@ -276 +276 @@
                  "Styles may be created with the 'style' command.\n"
                  "Some built-in styles include:\n"
-                 "   default  - the default owl formatting\n"
+                 "   default  - the default BarnOwl formatting\n"
                  "   oneline  - one line per-message\n"
                  "   perl     - legacy perl interface\n"
@@ -333 +333 @@
                "cursor moves between messages being displayed.\n"
                "The following modes are supported:\n\n"
-               "   normal      - This is the owl default.  Scrolling happens\n"
+               "   normal      - This is the BarnOwl default.  Scrolling happens\n"
                "                 when it needs to, and an attempt is made to\n"
                "                 keep the current message roughly near\n"