Changeset 894 for trunk/src/z-file.c

Timestamp:

05/11/08 22:18:36 (2 months ago)

Author:

takkaria

Message:

Make OS X always give us the correct home directory. Fixes #384, with thanks to Rowan Beentje, roustk, and Kenneth Boyd.

Files:

• trunk/src/z-file.c (modified) (2 diffs)

trunk/src/z-file.c

@@ -30 +30 @@
-#endif
-
+#ifdef MACH_O_CARBON
+# include <SystemConfiguration/SCDynamicStoreCopySpecific.h>
+#endif
+
-#ifdef HAVE_FCNTL_H
-# include <fcntl.h>
@@ -149 +153 @@
-
-                /* Look up a user (or "current" user) */
+#ifndef MACH_O_CARBON
-                if (username) pw = getpwnam(username);
-                else          pw = getpwuid(getuid());
-
+#else /* MACH_O_CARBON */
+
+                /* On Macs look up the console user to avoid problems with invalid root detection */
+                uid_t uid;
+                SCDynamicStoreCopyConsoleUser(NULL, &uid, NULL);
+                pw = getpwuid(uid);
+#endif /* !MACH_O_CARBON */
+                
-                if (!pw) return;
-