[Sbcl-commits] CVS: sbcl/src/code condition.lisp,1.50,1.51 filesys.lisp,1.46,1.47

[Christophe R. <cr...@us...>]

Update of /cvsroot/sbcl/sbcl/src/code
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28886/src/code

Modified Files:
	condition.lisp filesys.lisp 
Log Message:
0.8.13.77:
	Some bugfixes
	... make failures of REQUIRE printable.  How did that happen?
	... patch from Dave Roberts (sbcl-devel 2004-08-18) for
		sb-bsd-sockets export
	... fix for ENOUGH-NAMESTRING, allowing :relative pathnames
		to be namestringized.


Index: condition.lisp
===================================================================
RCS file: /cvsroot/sbcl/sbcl/src/code/condition.lisp,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -d -r1.50 -r1.51
--- condition.lisp	7 Aug 2004 16:57:55 -0000	1.50
+++ condition.lisp	18 Aug 2004 17:23:18 -0000	1.51
@@ -816,8 +816,9 @@
      (destructuring-bind (type data) (cdr reference)
        (ecase type
 	 (:node (format stream "Node ~S" data))
-	 (:variable (format stream "Variable ~S" data)))))
-    ;; FIXME: other documents (e.g. AMOP, Franz documentation :-)
+	 (:variable (format stream "Variable ~S" data))
+	 (:function (format stream "Function ~S" data)))))
+    ;; FIXME: other documents (e.g. CLIM, Franz documentation :-)
     ))
 (define-condition reference-condition ()
   ((references :initarg :references :reader reference-condition-references)))

Index: filesys.lisp
===================================================================
RCS file: /cvsroot/sbcl/sbcl/src/code/filesys.lisp,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- filesys.lisp	3 Feb 2004 14:17:09 -0000	1.46
+++ filesys.lisp	18 Aug 2004 17:23:18 -0000	1.47
@@ -375,7 +375,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 +390,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