diff options
| author | Karl Heuer <kwzh@gnu.org> | 1994-02-12 00:12:15 +0000 |
|---|---|---|
| committer | Karl Heuer <kwzh@gnu.org> | 1994-02-12 00:12:15 +0000 |
| commit | 1cac1f6f2ff70b7be978cd1c0baade1661f8f93f (patch) | |
| tree | 74e33105f60fd301f96b058841155b880d546736 /src/xrdb.c | |
| parent | 7246d1d3aac9a00d9eaccfc953e0ae0582b88a1b (diff) | |
| download | emacs-1cac1f6f2ff70b7be978cd1c0baade1661f8f93f.tar.gz emacs-1cac1f6f2ff70b7be978cd1c0baade1661f8f93f.tar.bz2 emacs-1cac1f6f2ff70b7be978cd1c0baade1661f8f93f.zip | |
(gethomedir): Look at LOGNAME before USER.
Diffstat (limited to 'src/xrdb.c')
| -rw-r--r-- | src/xrdb.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/xrdb.c b/src/xrdb.c index 112badf3629..9ab9f87e915 100644 --- a/src/xrdb.c +++ b/src/xrdb.c @@ -288,20 +288,17 @@ magic_file_p (string, string_len, class, escaped_suffix, suffix) static char * gethomedir () { - int uid; struct passwd *pw; char *ptr; char *copy; if ((ptr = getenv ("HOME")) == NULL) { - if ((ptr = getenv ("USER")) != NULL) + if ((ptr = getenv ("LOGNAME")) != NULL + || (ptr = getenv ("USER")) != NULL) pw = getpwnam (ptr); else - { - uid = getuid (); - pw = getpwuid (uid); - } + pw = getpwuid (getuid ()); if (pw) ptr = pw->pw_dir; |