From 6584a2c88efaa6931083721adae2f9f10e0fefd5 Mon Sep 17 00:00:00 2001 From: Nikodemus Siivola Date: Sat, 28 Oct 2006 09:57:00 +0000 Subject: [PATCH] 0.9.18.11: whitespace * Undo whitespace damage from Window commits. --- src/code/filesys.lisp | 4 ++-- src/code/target-pathname.lisp | 2 +- src/code/unix.lisp | 2 +- src/code/win32-pathname.lisp | 6 +++--- src/runtime/time.c | 6 +++--- tests/compiler.pure.lisp | 2 +- tests/filesys.pure.lisp | 4 ++-- version.lisp-expr | 4 ++-- 8 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/code/filesys.lisp b/src/code/filesys.lisp index f91ae33..1b82730 100644 --- a/src/code/filesys.lisp +++ b/src/code/filesys.lisp @@ -508,8 +508,8 @@ otherwise. An error of type FILE-ERROR is signaled if pathname is wild." (let ((trueishname (sb!unix:unix-resolve-links namestring))) (when trueishname (let* ((*ignore-wildcards* t) - (name (simplify-namestring - trueishname + (name (simplify-namestring + trueishname (pathname-host defaulted-pathname)))) (if (eq (sb!unix:unix-file-kind name) :directory) ;; FIXME: this might work, but it's ugly. diff --git a/src/code/target-pathname.lisp b/src/code/target-pathname.lisp index eee1e6a..33f4d8d 100644 --- a/src/code/target-pathname.lisp +++ b/src/code/target-pathname.lisp @@ -858,7 +858,7 @@ a host-structure or string." (let* ((end (%check-vector-sequence-bounds namestr start end))) (multiple-value-bind (new-host device directory file type version) (cond - (host + (host (funcall (host-parse-native host) namestr start end)) ((pathname-host defaults) (funcall (host-parse-native (pathname-host defaults)) diff --git a/src/code/unix.lisp b/src/code/unix.lisp index c0a3b8f..09146ab 100644 --- a/src/code/unix.lisp +++ b/src/code/unix.lisp @@ -907,7 +907,7 @@ SYSCALL-FORM. Repeat evaluation of SYSCALL-FORM if it is interrupted." (if (null link) (return pathname) (let ((new-pathname - (simplify-namestring + (simplify-namestring (if (relative-unix-pathname? link) (let* ((dir-len (1+ (position #\/ pathname diff --git a/src/code/win32-pathname.lisp b/src/code/win32-pathname.lisp index 81ddebd..ac29f7b 100644 --- a/src/code/win32-pathname.lisp +++ b/src/code/win32-pathname.lisp @@ -109,7 +109,7 @@ for piece = (subseq namestring start end) collect (if (and (string= piece "..") rest) :up - piece))) + piece))) (name-and-type (let* ((end (first (last components))) (dot (position #\. end :from-end t))) @@ -273,7 +273,7 @@ (unless directory (go :done)) :subdir (let ((piece (pop directory))) - (typecase piece + (typecase piece ((member :up) (write-string ".." s)) (string (write-string piece s)) (t (error "ungood piece in NATIVE-NAMESTRING: ~S" piece))) @@ -410,7 +410,7 @@ (t (setf dots nil) (setf (schar dst dst-len) char) - (incf dst-len))))) + (incf dst-len))))) ;; ...finish off (when (and last-slash (not (zerop last-slash))) (case dots diff --git a/src/runtime/time.c b/src/runtime/time.c index b4049c8..59a6fff 100644 --- a/src/runtime/time.c +++ b/src/runtime/time.c @@ -27,12 +27,12 @@ void get_timezone(time_t when, int *secwest, boolean *dst) /* No _r versions on Windows, but the API documentation also * doesn't warn them about being non-reentrant... So here's * hoping they actually are -- once Windows grows threads - * this better be checked, though. + * this better be checked, though. * * The Windows versions also don't support times before the * epoch, so we kludge it. */ - if (when < 0) - when = -when; + if (when < 0) + when = -when; ltm = *localtime(&when); gtm = *gmtime(&when); #else diff --git a/tests/compiler.pure.lisp b/tests/compiler.pure.lisp index 4ab5af3..95d2928 100644 --- a/tests/compiler.pure.lisp +++ b/tests/compiler.pure.lisp @@ -2146,6 +2146,6 @@ ;;; LET* + VALUES declaration: while the declaration is a non-standard ;;; and possibly a non-conforming extension, as long as we do support ;;; it, we might as well get it right. -;;; +;;; ;;; Bug reported by Kaersten Poeck on sbcl-devel 20061023. (compile nil '(lambda () (let* () (declare (values list))))) diff --git a/tests/filesys.pure.lisp b/tests/filesys.pure.lisp index 6e12676..cff87b5 100644 --- a/tests/filesys.pure.lisp +++ b/tests/filesys.pure.lisp @@ -92,7 +92,7 @@ (assert (equal "C:\\FOO" (native-namestring "C:\\FOO"))) (assert (equal "C:\\FOO" (native-namestring "C:/FOO"))) (assert (equal "C:\\FOO\\BAR" (native-namestring "C:\\FOO\\BAR"))) - ;; FIXME: Other platforms don't do this: either fix Windows + ;; FIXME: Other platforms don't do this: either fix Windows ;; so that it works even with the same logic others use, or ;; make this official. (Currently just a kludge.) (assert (equal "C:\\FOO\\BAR" (native-namestring "C:\\FOO\\BAR\\")))) @@ -102,7 +102,7 @@ ;;; given only safe characters in the namestring, NATIVE-PATHNAME will ;;; never error, and NATIVE-NAMESTRING on the result will return the ;;; original namestring. -(with-test (:name :random-native-namestrings) +(with-test (:name :random-native-namestrings) (let ((safe-chars (coerce (cons #\Newline diff --git a/version.lisp-expr b/version.lisp-expr index 2e90dea..8bc6cc2 100644 --- a/version.lisp-expr +++ b/version.lisp-expr @@ -1,4 +1,4 @@ -;;; This is the master value for LISP-IMPLEMENTATION-VERSION. It's +';;; This is the master value for LISP-IMPLEMENTATION-VERSION. It's ;;; separated into its own file here so that it's easy for ;;; text-munging make-ish or cvs-ish scripts to find and tweak it. For ;;; the convenience of such scripts, only a simple subset of Lisp @@ -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".) -"0.9.18.10" +"0.9.18.11" -- 1.7.10.4