Use getpwnam(getlogin()) before getpwuid(getuid())

1997-08-27 13:36:34 +00:00 · 1997-08-27 13:36:34 +00:00 · eb8eee5a55
commit eb8eee5a55
parent 263f4be35c
1 changed files with 5 additions and 3 deletions
--- a/lib/libc/gen/glob.c
+++ b/lib/libc/gen/glob.c
@ -363,10 +363,12 @@ globtilde(pattern, patbuf, patbuf_len, pglob)
 		 * the password file
 		 */
 		if (issetugid() != 0 || (h = getenv("HOME")) == NULL) {
-			if ((pwd = getpwuid(getuid())) == NULL)
-				return pattern;
-			else
+			if (((h = getlogin()) != NULL &&
+			     (pwd = getpwnam(h)) != NULL) ||
+			    (pwd = getpwuid(getuid())) != NULL)
 				h = pwd->pw_dir;
+			else
+				return pattern;
 		}
 	}
 	else {