Changeset 396505be for tester.c

Timestamp:

Jul 16, 2011, 12:28:10 AM (14 years ago)

Author:

David Benjamin <davidben@mit.edu>

Branches:

master, release-1.10, release-1.8, release-1.9

Children:

99ac28a

Parents:

e59d775

git-author:

David Benjamin <davidben@mit.edu> (07/10/11 19:00:08)

git-committer:

David Benjamin <davidben@mit.edu> (07/16/11 00:28:10)

Message:

Use owl_global_get_homedir for ~ in owl_util_makepath

It's strange that ~/.zephyr.subs and ~/.owl/startup are computed
differently. We should use the same one. This also matches bash in that
~ prefers $HOME over passwd. If don't have a homedir at all, this
defaults to / instead of keeping the ~, but that won't happen and at
least it's consistent with existing behavior for zephyr dotfiles.

File:

• tester.c (modified) (2 diffs)

tester.c

@@ -227 +227 @@
                 "\"");
 
-  GString *g = g_string_new("");
-  owl_string_appendf_quoted(g, "%q foo %q%q %s %", "hello", "world is", "can't");
+  GString *quoted = g_string_new("");
+  owl_string_appendf_quoted(quoted, "%q foo %q%q %s %", "hello", "world is", "can't");
   FAIL_UNLESS("owl_string_appendf",
-              !strcmp(g->str, "hello foo 'world is'\"can't\" %s %"));
-  g_string_free(g, true);
+              !strcmp(quoted->str, "hello foo 'world is'\"can't\" %s %"));
+  g_string_free(quoted, true);
 
 
@@ -275 +275 @@
 
   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");
-  }
+  home = owl_global_get_homedir(&g);
   s = owl_util_makepath("~");
   FAIL_UNLESS("makepath ~", !strcmp(home, s));