From 57b530ca87484853ae25218c842a9b00c3f7066e Mon Sep 17 00:00:00 2001 From: kreuter Date: Mon, 10 Dec 2007 22:16:47 +0000 Subject: [PATCH] 1.0.12.26: Fix minor regression in win32 native-namestringification src/code/win32-pathname.lisp: some Windows system calls don't accept directory names ending with backslashes. --- src/code/win32-pathname.lisp | 6 ++++-- version.lisp-expr | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/code/win32-pathname.lisp b/src/code/win32-pathname.lisp index f904d6e..e91a7b2 100644 --- a/src/code/win32-pathname.lisp +++ b/src/code/win32-pathname.lisp @@ -261,7 +261,9 @@ (unparse-win32-file pathname))) (defun unparse-native-win32-namestring (pathname as-file) - (declare (type pathname pathname)) + (declare (type pathname pathname) + ;; Windows doesn't like directory names with trailing slashes. + (ignore as-file)) (let* ((device (pathname-device pathname)) (directory (pathname-directory pathname)) (name (pathname-name pathname)) @@ -289,7 +291,7 @@ (string (write-string piece s)) (t (error "ungood directory segment in NATIVE-NAMESTRING: ~S" piece))) - (when (or directory (not as-file)) + (when (or directory name) (write-char #\\ s))) (when directory (go :subdir)) diff --git a/version.lisp-expr b/version.lisp-expr index a56c9a6..9e3bcb1 100644 --- a/version.lisp-expr +++ b/version.lisp-expr @@ -17,4 +17,4 @@ ;;; checkins which aren't released. (And occasionally for internal ;;; versions, especially for internal versions off the main CVS ;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".) -"1.0.12.25" +"1.0.12.26" -- 1.7.10.4