X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Ftarget-pathname.lisp;h=6ae6f41909cc41bad1b1cf70628b05c66a1d0553;hb=a7c2a16d0c2be6709becc962be1cb5e0aeda68c6;hp=7089003a9a103a382eaef7d14782c3bf2500fde5;hpb=1b64697e4e8a85ff8f11f5c05de71687dc5ad2e2;p=sbcl.git

diff --git a/src/code/target-pathname.lisp b/src/code/target-pathname.lisp
index 7089003..6ae6f41 100644
--- a/src/code/target-pathname.lisp
+++ b/src/code/target-pathname.lisp
@@ -318,9 +318,9 @@
 			      (simple-string
 			       (check-for pred piece))
 			      (cons
-			       (case (car in)
+			       (case (car piece)
 				 (:character-set
-				  (check-for pred (cdr in))))))
+				  (check-for pred (cdr piece))))))
 			(return t))))
 		   (list
 		    (dolist (x in)
@@ -625,7 +625,7 @@ a host-structure or string."
 	  (let ((potential-host
 		 (logical-word-or-lose (subseq namestr start colon))))
 	    ;; depending on the outcome of CSR comp.lang.lisp post
-	    ;; "can PARSE-NAMESTRING create logical hosts, we may need
+	    ;; "can PARSE-NAMESTRING create logical hosts", we may need
 	    ;; to do things with potential-host (create it
 	    ;; temporarily, parse the namestring and unintern the
 	    ;; logical host potential-host on failure.
@@ -683,7 +683,10 @@ a host-structure or string."
 	      ;; *DEFAULT-PATHNAME-DEFAULTS has a SB-IMPL::UNIX-HOST
 	      ;; for a host.
 	      ((pathname-host defaults)
-	       (funcall (host-parse (pathname-host defaults)) namestr start end))
+	       (funcall (host-parse (pathname-host defaults))
+			namestr
+			start
+			end))
 	      ;; I don't think we should ever get here, as the default
 	      ;; host will always have a non-null HOST, given that we
 	      ;; can't create a new pathname without going through
@@ -909,7 +912,7 @@ a host-structure or string."
   (declare (type pathname-designator in-pathname))
   (with-pathname (pathname in-pathname)
     (with-pathname (wildname in-wildname)
-      (macrolet ((frob (field &optional (op 'components-match ))
+      (macrolet ((frob (field &optional (op 'components-match))
 		   `(or (null (,field wildname))
 			(,op (,field pathname) (,field wildname)))))
 	(and (or (null (%pathname-host wildname))
@@ -1471,15 +1474,9 @@ a host-structure or string."
 	  (canonicalize-logical-pathname-translations translations host))
     (setf (logical-host-translations host) translations)))
 
-;;; KLUDGE: Ordinarily known functions aren't defined recursively, and
-;;; it's common for compiler problems (e.g. missing/broken
-;;; optimization transforms) to cause them to recurse inadvertently,
-;;; so the compiler should warn about it. But the natural definition
-;;; of TRANSLATE-LOGICAL-PATHNAME *is* recursive; and we don't want
-;;; the warning, so we hide the definition of T-L-P in this
-;;; differently named function so that the compiler won't warn about
-;;; it. -- WHN 2001-09-16
-(defun %translate-logical-pathname (pathname)
+(defun translate-logical-pathname (pathname &key)
+  #!+sb-doc
+  "Translate PATHNAME to a physical pathname, which is returned."
   (declare (type pathname-designator pathname)
 	   (values (or null pathname)))
   (typecase pathname
@@ -1496,13 +1493,6 @@ a host-structure or string."
     (pathname pathname)
     (t (translate-logical-pathname (pathname pathname)))))
 
-(defun translate-logical-pathname (pathname &key)
-  #!+sb-doc
-  "Translate PATHNAME to a physical pathname, which is returned."
-  (declare (type pathname-designator pathname)
-	   (values (or null pathname)))
-  (%translate-logical-pathname pathname))
-
 (defvar *logical-pathname-defaults*
   (%make-logical-pathname (make-logical-host :name "BOGUS")
 			  :unspecific