X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Ffilesys.lisp;h=1440777270cf5444fe4983512ddf92e978a2a20d;hb=c1aeac123df223746249567a9c0d2f656d1222cb;hp=d36f8c963f60dc4e991c4d42668383419cd8ee0f;hpb=4eb1a6d3ad2b7dcc19ac0ec979a1eb1eb049659a;p=sbcl.git

diff --git a/src/code/filesys.lisp b/src/code/filesys.lisp
index d36f8c9..1440777 100644
--- a/src/code/filesys.lisp
+++ b/src/code/filesys.lisp
@@ -531,15 +531,15 @@
   (let ((directory (pathname-directory pathname)))
     (/noshow0 "computed DIRECTORY")
     (if directory
-	(ecase (car directory)
+	(ecase (first directory)
 	  (:absolute
 	   (/noshow0 "absolute directory")
-	   (%enumerate-directories "/" (cdr directory) pathname
+	   (%enumerate-directories "/" (rest directory) pathname
 				   verify-existence follow-links
 				   nil function))
 	  (:relative
 	   (/noshow0 "relative directory")
-	   (%enumerate-directories "" (cdr directory) pathname
+	   (%enumerate-directories "" (rest directory) pathname
 				   verify-existence follow-links
 				   nil function)))
 	(%enumerate-files "" pathname verify-existence function))))
@@ -655,8 +655,7 @@
 	  (t
 	   (/noshow0 "default case")
 	   (let ((file (concatenate 'string directory name)))
-	     (/noshow0 "computed basic FILE=..")
-	     (/primitive-print file)
+	     (/noshow "computed basic FILE")
 	     (unless (or (null type) (eq type :unspecific))
 	       (/noshow0 "tweaking FILE for more-or-less-:UNSPECIFIC case")
 	       (setf file (concatenate 'string file "." type)))
@@ -664,8 +663,7 @@
 	       (/noshow0 "tweaking FILE for more-or-less-:WILD case")
 	       (setf file (concatenate 'string file "."
 				       (quick-integer-to-string version))))
-	     (/noshow0 "finished possibly tweaking FILE=..")
-	     (/primitive-print file)
+	     (/noshow0 "finished possibly tweaking FILE")
 	     (when (or (not verify-existence)
 		       (sb!unix:unix-file-kind file t))
 	       (/noshow0 "calling FUNCTION on FILE")
@@ -877,7 +875,7 @@
 
 (defun file-author (file)
   #!+sb-doc
-  "Return the file author as a string, or nil if the author cannot be
+  "Return the file author as a string, or NIL if the author cannot be
  determined. Signal an error of type FILE-ERROR if FILE doesn't exist,
  or FILE is a wild pathname."
   (if (wild-pathname-p file)
@@ -893,7 +891,7 @@
 	(multiple-value-bind (winp dev ino mode nlink uid)
 	    (sb!unix:unix-stat name)
 	  (declare (ignore dev ino mode nlink))
-	  (if winp (lookup-login-name uid))))))
+	  (and winp (sb!unix:uid-username uid))))))
 
 ;;;; DIRECTORY
 
@@ -911,6 +909,7 @@
 	;; can arise when e.g. multiple symlinks map to the same
 	;; truename).
 	(truenames (make-hash-table :test #'equal))
+	;; FIXME: not really right, as per bug 139
         (merged-pathname (merge-pathnames pathname
 					  (make-pathname :name :wild
 							 :type :wild
@@ -934,71 +933,6 @@
                   #'string<
 		  :key #'car))))
 
-;;;; translating Unix uid's
-;;;;
-;;;; FIXME: should probably move into unix.lisp
-
-(defvar *uid-hash-table* (make-hash-table)
-  #!+sb-doc
-  "hash table for keeping track of uid's and login names")
-
-(/show0 "filesys.lisp 844")
-
-;;; LOOKUP-LOGIN-NAME translates a user id into a login name. Previous
-;;; lookups are cached in a hash table since groveling the passwd(s)
-;;; files is somewhat expensive. The table may hold NIL for id's that
-;;; cannot be looked up since this keeps the files from having to be
-;;; searched in their entirety each time this id is translated.
-(defun lookup-login-name (uid)
-  (multiple-value-bind (login-name foundp) (gethash uid *uid-hash-table*)
-    (if foundp
-	login-name
-	(setf (gethash uid *uid-hash-table*)
-	      (get-group-or-user-name :user uid)))))
-
-;;; GET-GROUP-OR-USER-NAME first tries "/etc/passwd" ("/etc/group")
-;;; since it is a much smaller file, contains all the local id's, and
-;;; most uses probably involve id's on machines one would login into.
-;;; Then if necessary, we look in "/etc/passwds" ("/etc/groups") which
-;;; is really long and has to be fetched over the net.
-;;;
-;;; The result is a SIMPLE-STRING or NIL.
-;;; 
-;;; FIXME: Now that we no longer have lookup-group-name, we no longer need
-;;; the GROUP-OR-USER argument.
-(defun get-group-or-user-name (group-or-user id)
-  (declare (type (member :group :user) group-or-user))
-  (declare (type index id))
-  (let ((id-string (let ((*print-base* 10)) (prin1-to-string id))))
-    (declare (simple-string id-string))
-    (multiple-value-bind (file1 file2)
-	(ecase group-or-user
-	  (:group (values "/etc/group" "/etc/groups"))
-	  (:user (values "/etc/passwd" "/etc/passwd")))
-      (or (get-group-or-user-name-aux id-string file1)
-	  (get-group-or-user-name-aux id-string file2)))))
-
-;;; FIXME: Isn't there now a POSIX routine to parse the passwd file?
-;;; getpwent? getpwuid?
-(defun get-group-or-user-name-aux (id-string passwd-file)
-  (with-open-file (stream passwd-file)
-    (loop
-      (let ((entry (read-line stream nil)))
-	(unless entry (return nil))
-	(let ((name-end (position #\: (the simple-string entry)
-				  :test #'char=)))
-	  (when name-end
-	    (let ((id-start (position #\: (the simple-string entry)
-				      :start (1+ name-end) :test #'char=)))
-	      (when id-start
-		(incf id-start)
-		(let ((id-end (position #\: (the simple-string entry)
-					:start id-start :test #'char=)))
-		  (when (and id-end
-			     (string= id-string entry
-				      :start2 id-start :end2 id-end))
-		    (return (subseq entry 0 name-end))))))))))))
-
 (/show0 "filesys.lisp 899")
 
 ;;; predicate to order pathnames by; goes by name