X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Ffilesys.lisp;h=aa8b5013402c5020be7141b59b55b7ee0a29ff80;hb=dc9d03a1c43398d3a860520c6ea03e8d5838d142;hp=1d243d88ba9e3626bbfce96255c55c9a40c9a8ea;hpb=531b03cfcbc4071c5283309f05d9186e051e5513;p=sbcl.git

diff --git a/src/code/filesys.lisp b/src/code/filesys.lisp
index 1d243d8..aa8b501 100644
--- a/src/code/filesys.lisp
+++ b/src/code/filesys.lisp
@@ -192,8 +192,9 @@
       (values absolute (pieces)))))
 
 (defun parse-unix-namestring (namestr start end)
-  (declare (type simple-base-string namestr)
+  (declare (type simple-string namestr)
            (type index start end))
+  (setf namestr (coerce namestr 'simple-base-string))
   (multiple-value-bind (absolute pieces) (split-at-slashes namestr start end)
     (multiple-value-bind (name type version)
 	(let* ((tail (car (last pieces)))
@@ -296,7 +297,7 @@
 	      (t
 	       (error "invalid pattern piece: ~S" piece))))))
        (apply #'concatenate
-	      'simple-string
+	      'simple-base-string
 	      (strings))))))
 
 (defun unparse-unix-directory-list (directory)
@@ -322,7 +323,7 @@
 	   (pieces "/"))
 	  (t
 	   (error "invalid directory component: ~S" dir)))))
-    (apply #'concatenate 'simple-string (pieces))))
+    (apply #'concatenate 'simple-base-string (pieces))))
 
 (defun unparse-unix-directory (pathname)
   (declare (type pathname pathname))
@@ -350,18 +351,18 @@
       (when type-supplied
 	(unless name
 	  (error "cannot specify the type without a file: ~S" pathname))
-	(when (typep type 'simple-base-string)
+	(when (typep type 'simple-string)
 	  (when (position #\. type)
 	    (error "type component can't have a #\. inside: ~S" pathname)))
 	(strings ".")
 	(strings (unparse-unix-piece type))))
-    (apply #'concatenate 'simple-string (strings))))
+    (apply #'concatenate 'simple-base-string (strings))))
 
 (/show0 "filesys.lisp 406")
 
 (defun unparse-unix-namestring (pathname)
   (declare (type pathname pathname))
-  (concatenate 'simple-string
+  (concatenate 'simple-base-string
 	       (unparse-unix-directory pathname)
 	       (unparse-unix-file pathname)))
 
@@ -375,7 +376,10 @@
 	     (defaults-directory (%pathname-directory defaults))
 	     (prefix-len (length defaults-directory))
 	     (result-directory
-	      (cond ((and (> prefix-len 1)
+	      (cond ((null pathname-directory) '(:relative))
+		    ((eq (car pathname-directory) :relative)
+		     pathname-directory)
+		    ((and (> prefix-len 1)
 			  (>= (length pathname-directory) prefix-len)
 			  (compare-component (subseq pathname-directory
 						     0 prefix-len)
@@ -387,8 +391,7 @@
 		     ;; We are an absolute pathname, so we can just use it.
 		     pathname-directory)
 		    (t
-		     ;; We are a relative directory. So we lose.
-		     (lose)))))
+		     (bug "Bad fallthrough in ~S" 'unparse-unix-enough)))))
 	(strings (unparse-unix-directory-list result-directory)))
       (let* ((pathname-type (%pathname-type pathname))
 	     (type-needed (and pathname-type
@@ -581,9 +584,10 @@
     (/noshow0 "computed NAME, TYPE, and VERSION")
     (cond ((member name '(nil :unspecific))
 	   (/noshow0 "UNSPECIFIC, more or less")
-	   (when (or (not verify-existence)
-		     (sb!unix:unix-file-kind directory))
-	     (funcall function directory)))
+           (let ((directory (coerce directory 'base-string)))
+             (when (or (not verify-existence)
+                       (sb!unix:unix-file-kind directory))
+               (funcall function directory))))
 	  ((or (pattern-p name)
 	       (pattern-p type)
 	       (eq name :wild)
@@ -1038,7 +1042,7 @@
 			       :device (pathname-device pathname)
 			       :directory (subseq dir 0 i))))
 		 (unless (probe-file newpath)
-		   (let ((namestring (namestring newpath)))
+		   (let ((namestring (coerce (namestring newpath) 'base-string)))
 		     (when verbose
 		       (format *standard-output*
 			       "~&creating directory: ~A~%"