Changeset 14324

Timestamp:

Oct 4, 2010, 1:51:26 PM (14 years ago)

Author:

R. Matthew Emerson

Message:

Change user-homedir-pathname not to rely on ignore-errors (we can't
signal errors in the cold load).

File:

• trunk/source/level-1/l1-pathnames.lisp (modified) (1 diff)

trunk/source/level-1/l1-pathnames.lisp

@@ -624 +624 @@
   "Return the home directory of the user as a pathname."
   (declare (ignore host))
-  (let* ((native
-          (ignore-errors
-            (truename
-             (native-to-directory-pathname (or #+ccl-qres (getenv "HOME")
-                                               (get-user-home-dir (getuid))))))))
-    (if (and native (eq :absolute (car (pathname-directory native))))
-      native
-      ;; Another plausible choice here is
-      ;; #p"/tmp/.hidden-directory-of-some-irc-bot-in-eastern-europe/"
-      ;; Of course, that might already be the value of $HOME.  Anyway,
-      ;; the user's home directory just contains "config files" (like
-      ;; SSH keys), and spoofing it can't hurt anything.
+  (let* ((native (get-user-home-dir (getuid)))
+         (pathname (and native
+                        (truename (native-to-directory-pathname native)))))
+    (if (and pathname (eq :absolute (car (pathname-directory pathname))))
+      pathname
       (make-pathname :directory '(:absolute) :defaults nil))))
+