From 9c79328c5c2bb1233089126fe9c69af69435b837 Mon Sep 17 00:00:00 2001 From: William Harold Newman Date: Mon, 16 Apr 2001 16:33:07 +0000 Subject: [PATCH] 0.6.11.39: trivial changes syncing my OpenBSD and Linux checkouts --- src/code/filesys.lisp | 3 ++- src/code/target-pathname.lisp | 12 ++++++------ src/code/unix.lisp | 9 +++------ version.lisp-expr | 2 +- 4 files changed, 12 insertions(+), 14 deletions(-) diff --git a/src/code/filesys.lisp b/src/code/filesys.lisp index 6cd4c40..540fe55 100644 --- a/src/code/filesys.lisp +++ b/src/code/filesys.lisp @@ -495,10 +495,11 @@ &key (verify-existence t) (follow-links t)) &body body) - (let ((body-name (gensym))) + (let ((body-name (gensym "ENUMERATE-MATCHES-BODY-FUN-"))) `(block nil (flet ((,body-name (,var) ,@body)) + (declare (dynamic-extent ,body-name)) (%enumerate-matches (pathname ,pathname) ,verify-existence ,follow-links diff --git a/src/code/target-pathname.lisp b/src/code/target-pathname.lisp index eea013f..5b6aa9f 100644 --- a/src/code/target-pathname.lisp +++ b/src/code/target-pathname.lisp @@ -529,7 +529,7 @@ a host-structure or string." (defun pathname-host (pathname &key (case :local)) #!+sb-doc - "Accessor for the pathname's host." + "Return PATHNAME's host." (declare (type pathname-designator pathname) (type (member :local :common) case) (values host) @@ -539,7 +539,7 @@ a host-structure or string." (defun pathname-device (pathname &key (case :local)) #!+sb-doc - "Accessor for pathname's device." + "Return PATHNAME's device." (declare (type pathname-designator pathname) (type (member :local :common) case)) (with-pathname (pathname pathname) @@ -551,7 +551,7 @@ a host-structure or string." (defun pathname-directory (pathname &key (case :local)) #!+sb-doc - "Accessor for the pathname's directory list." + "Return PATHNAME's directory." (declare (type pathname-designator pathname) (type (member :local :common) case)) (with-pathname (pathname pathname) @@ -562,7 +562,7 @@ a host-structure or string." :lower))))) (defun pathname-name (pathname &key (case :local)) #!+sb-doc - "Accessor for the pathname's name." + "Return PATHNAME's name." (declare (type pathname-designator pathname) (type (member :local :common) case)) (with-pathname (pathname pathname) @@ -574,7 +574,7 @@ a host-structure or string." (defun pathname-type (pathname &key (case :local)) #!+sb-doc - "Accessor for the pathname's name." + "Return PATHNAME's type." (declare (type pathname-designator pathname) (type (member :local :common) case)) (with-pathname (pathname pathname) @@ -586,7 +586,7 @@ a host-structure or string." (defun pathname-version (pathname) #!+sb-doc - "Accessor for the pathname's version." + "Return PATHNAME's version." (declare (type pathname-designator pathname)) (with-pathname (pathname pathname) (%pathname-version pathname))) diff --git a/src/code/unix.lisp b/src/code/unix.lisp index 1cf9b43..950a823 100644 --- a/src/code/unix.lisp +++ b/src/code/unix.lisp @@ -119,8 +119,6 @@ ;;;; hacking the Unix environment -(/show0 "unix.lisp 122") - (def-alien-routine ("getenv" posix-getenv) c-string "Return the environment string \"name=value\" which corresponds to NAME, or NIL if there is none." @@ -130,8 +128,8 @@ (defun unix-rename (name1 name2) #!+sb-doc - "Unix-rename renames the file with string name1 to the string - name2. NIL and an error code is returned if an error occurs." + "Unix-rename renames the file with string NAME1 to the string + NAME2. NIL and an error code is returned if an error occurs." (declare (type unix-pathname name1 name2)) (void-syscall ("rename" c-string c-string) name1 name2)) @@ -139,10 +137,9 @@ (/show0 "unix.lisp 220") +;;; FIXME: Isn't there some way to use a C wrapper to avoid this hand-copying? (defconstant +max-s-long+ 2147483647) (defconstant +max-u-long+ 4294967295) - -;;; FIXME: Isn't there some way to use a C wrapper to avoid this hand-copying? (def-alien-type quad-t #+nil long-long #-nil (array long 2)) (def-alien-type uquad-t #+nil unsigned-long-long #-nil (array unsigned-long 2)) diff --git a/version.lisp-expr b/version.lisp-expr index feb70db..6095a98 100644 --- a/version.lisp-expr +++ b/version.lisp-expr @@ -15,4 +15,4 @@ ;;; versions, and a string like "0.6.5.12" is used for versions which ;;; aren't released but correspond only to CVS tags or snapshots. -"0.6.11.38" +"0.6.11.39" -- 1.7.10.4