Changeset 8510d5b for global.c

Timestamp:

Dec 21, 2010, 5:54:58 PM (13 years ago)

Author:

David Benjamin <davidben@mit.edu>

Branches:

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

Children:

f640876

Parents:

fa90c34

git-author:

David Benjamin <davidben@mit.edu> (12/15/10 15:05:57)

git-committer:

David Benjamin <davidben@mit.edu> (12/21/10 17:54:58)

Message:

Check passwd entries to determine home dir

Still manually check the HOME variable because g_get_home_dir prefers
passwd entries to environment variables. (Should we?)

File:

• global.c (modified) (2 diffs)

global.c

@@ -19 +19 @@
   char hostname[MAXHOSTNAMELEN];
   char *cd;
+  const char *homedir;
 
   g_type_init();
@@ -83 +84 @@
 
   /* Fill in some variables which don't have constant defaults */
-  /* TODO: come back later and check passwd file first */
-  g->homedir=owl_strdup(getenv("HOME"));
+
+  /* glib's g_get_home_dir prefers passwd entries to $HOME, so we
+   * explicitly check getenv first. */
+  homedir = getenv("HOME");
+  if (!homedir)
+    homedir = g_get_home_dir();
+  g->homedir = owl_strdup(homedir);
 
   g->confdir = NULL;