Changes in / [165b0c9:c6332f5]

Files:

• barnowl (modified) (1 diff)
• functions.c (modified) (1 diff)
• runtests.sh (modified) (1 diff)
• scripts/locker-build (modified) (1 diff)
• t/completion.t (modified) (1 diff)
• t/unicode.t (modified) (1 diff)
• tester.c (modified) (5 diffs)
• util.c (modified) (2 diffs)

barnowl

@@ -8 +8 @@
 
 if test ! -x "$EXE"; then
-    echo "Cannot find $EXE" >&2
+    echo "Cannot find barnowl.bin" >&2
     exit 1
 fi

functions.c

@@ -3226 +3226 @@
       } else if (myargc > 0) {
         /* Spawn the child. */
-        GPid pid;
+        pid_t pid;
         GError *error = NULL;
         owl_function_debugmsg("About to exec \"%s\" with %d arguments", argv[0], myargc);

runtests.sh

@@ -1 +1 @@
 #!/bin/sh
-exec env HARNESS_PERL=./tester prove --failures t/
+SRCDIR=`dirname "${0}"`
+
+export BARNOWL_DATA_DIR="$SRCDIR/perl/"
+export BARNOWL_BIN_DIR="$SRCDIR/"
+
+HARNESS_PERL=./tester exec prove --failures t/

scripts/locker-build

@@ -85 +85 @@
     BARNOWL="/afs/sipb.mit.edu/project/barnowl/arch/$ATHENA_SYS"
     export PKG_CONFIG_PATH="$BARNOWL/lib/pkgconfig"
-    eval $("$BARNOWL/bin/barnowl-perl-config")
 
     SUFFIX=

t/completion.t

@@ -323 +323 @@
 }
 
-mkpath(["$tmpdir/.owl/",
-        "$tmpdir/.owl/modules/",
-        "$tmpdir/Public/",
-        "$tmpdir/Private/",
-        "$tmpdir/.ours",
-        "$tmpdir/www"],
-       0, 0700);
+mkpath("$tmpdir/.owl/",
+       "$tmpdir/.owl/modules/",
+       "$tmpdir/Public/",
+       "$tmpdir/Private/",
+       "$tmpdir/.ours",
+       "$tmpdir/www",
+     {mode => 0700});
 touch("$tmpdir/.zephyr.subs");
 touch("$tmpdir/wheee");

t/unicode.t

@@ -5 +5 @@
 use Encode;
 
+BEGIN { bootstrap BarnOwl; };
+
 use Test::More qw(no_plan);
-
-use BarnOwl;
 
 my $unicode = "“hello”";

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
@@ -133 +136 @@
 {
   int numfailed=0;
-  char *s, *path, *home;
+  const char *home;
+  char *s, *path;
+  struct passwd *pw;
 
   printf("# BEGIN testing owl_util\n");
@@ -222 +227 @@
                 "\"");
 
-  GString *quoted = g_string_new("");
-  owl_string_appendf_quoted(quoted, "%q foo %q%q %s %", "hello", "world is", "can't");
+  GString *g = g_string_new("");
+  owl_string_appendf_quoted(g, "%q foo %q%q %s %", "hello", "world is", "can't");
   FAIL_UNLESS("owl_string_appendf",
-              !strcmp(quoted->str, "hello foo 'world is'\"can't\" %s %"));
-  g_string_free(quoted, true);
+              !strcmp(g->str, "hello foo 'world is'\"can't\" %s %"));
+  g_string_free(g, true);
 
 
@@ -269 +274 @@
   g_free(s);
 
-  home = g_strdup(owl_global_get_homedir(&g));
+  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_build_filename(home, "foo/bar/baz", NULL);
+  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);
-  g_free(home);
-
-  home = owl_util_homedir_for_user("root");
-  if (home == NULL) {
+
+  errno = 0;
+  pw = getpwnam("root");
+  if (pw) {
+    home = pw->pw_dir;
+  } else {
     /* Just make some noise so we notice. */
-    home = g_strdup("<WHAT>");
-    fprintf(stderr, "owl_util_homedir_for_user failed");
+    home = "<WHAT>";
+    fprintf(stderr, "getpwnam: %s", errno ? strerror(errno) : "No such user");
   }
 
@@ -292 +307 @@
   g_free(s);
 
-  path = g_build_filename(home, "foo/bar/baz", NULL);
+  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);
-  g_free(home);
 
   /* if (numfailed) printf("*** WARNING: failures encountered with owl_util\n"); */

util.c

@@ -32 +32 @@
 }
 
-CALLER_OWN char *owl_util_homedir_for_user(const char *name)
-{
-  int err;
-  struct passwd pw_buf;
-  struct passwd *pw;
-
-  char *pw_strbuf, *ret;
-  long pw_strbuf_len = sysconf(_SC_GETPW_R_SIZE_MAX);
-  if (pw_strbuf_len < 0) {
-    /* If we really hate ourselves, we can be fancy and loop until we stop
-     * getting ERANGE. For now just pick a random number. */
-    owl_function_error("owl_util_homedir_for_user: Could not get _SC_GETPW_R_SIZE_MAX");
-    pw_strbuf_len = 16384;
-  }
-  pw_strbuf = g_new0(char, pw_strbuf_len);
-  err = getpwnam_r(name, &pw_buf, pw_strbuf, pw_strbuf_len, &pw);
-  if (err) {
-    owl_function_error("getpwuid_r: %s", strerror(err));
-    /* Fall through; pw will be NULL. */
-  }
-  ret = pw ? g_strdup(pw->pw_dir) : NULL;
-  g_free(pw_strbuf);
-  return ret;
-}
-
 /* Return a "nice" version of the path.  Tilde expansion is done, and
  * duplicate slashes are removed.  Caller must free the return.
@@ -67 +42 @@
     /* 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);
 
-    /* Patch together a new path. Replace the ~ and tilde-prefix with
-       the homedir, if available. */
     if (end == in + 1) {
-      /* My home directory. Use the one in owl_global for consistency with
-       * owl_zephyr_dotfile. */
-      out = g_strconcat(owl_global_get_homedir(&g), end, NULL);
+      /* My home directory. */
+      pw = getpwuid(getuid());
     } else {
       /* Someone else's home directory. */
       char *user = g_strndup(in + 1, end - (in + 1));
-      char *home = owl_util_homedir_for_user(user);
-      if (home) {
-        out = g_strconcat(home, end, NULL);
-      } else {
-        out = g_strdup(in);
-      }
-      g_free(home);
+      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);
+      out = g_strdup(in);
   }