From 3b699926fb8c6c08603e38531ad4ee4daac7c29f Mon Sep 17 00:00:00 2001 From: toy <toy> Date: Thu, 31 May 2001 17:00:51 +0000 Subject: [PATCH] When unparse-unix-file is given a logical pathname, don't put ~'s around the version since that's not valid logical pathname syntax. --- code/filesys.lisp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/code/filesys.lisp b/code/filesys.lisp index 644a2f5e7..f5184f6d9 100644 --- a/code/filesys.lisp +++ b/code/filesys.lisp @@ -6,7 +6,7 @@ ;;; Scott Fahlman or slisp-group@cs.cmu.edu. ;;; (ext:file-comment - "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/filesys.lisp,v 1.63 2001/03/12 12:44:31 pw Exp $") + "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/filesys.lisp,v 1.64 2001/05/31 17:00:51 toy Exp $") ;;; ;;; ********************************************************************** ;;; @@ -412,13 +412,14 @@ (defun unparse-unix-directory (pathname) (declare (type pathname pathname)) (unparse-unix-directory-list (%pathname-directory pathname))) - + (defun unparse-unix-file (pathname) (declare (type pathname pathname)) (collect ((strings)) (let* ((name (%pathname-name pathname)) (type (%pathname-type pathname)) (type-supplied (not (or (null type) (eq type :unspecific)))) + (logical-p (logical-pathname-p pathname)) (version (%pathname-version pathname)) (version-supplied (not (or (null version) (eq version :newest))))) (when name @@ -430,8 +431,9 @@ (strings (unparse-unix-piece type))) (when version-supplied (strings (if (eq version :wild) - ".~*~" - (format nil ".~~~D~~" version))))) + (if logical-p ".*" ".~*~") + (format nil (if logical-p ".~D" ".~~~D~~") + version))))) (and (strings) (apply #'concatenate 'simple-string (strings))))) (defun unparse-unix-namestring (pathname) -- GitLab