From f8ca896c1651aaa3b70b9a4669af341070ad47ef Mon Sep 17 00:00:00 2001 From: William Harold Newman Date: Wed, 30 May 2001 00:01:23 +0000 Subject: [PATCH] 0.6.12.19: deprecated #'SB-EXT:DEFAULT-DIRECTORY, since *DEFAULT-PATHNAME-DEFAULTS* is the ANSI way to do it failed to get rid of DEFVAR *DEFAULT-PATHNAME-DEFAULTS* initialization, since someone is using this var too early in cold init. Maybe next time.. removed stale (SEARCH-LIST "default:") stuff deleted unused CADDR-T, DADDR-T, QADDR-T, QUAD-T, UQUAD-T, SIZE-T, SSIZE-T, +MAX-S-LONG+, +MAX-U-LONG+, SWBLK-T --- package-data-list.lisp-expr | 8 ++++---- src/code/filesys.lisp | 22 +++++++++++++--------- src/code/unix.lisp | 22 +++++----------------- 3 files changed, 22 insertions(+), 30 deletions(-) diff --git a/package-data-list.lisp-expr b/package-data-list.lisp-expr index 27f1be3..bdc6cb2 100644 --- a/package-data-list.lisp-expr +++ b/package-data-list.lisp-expr @@ -1475,8 +1475,8 @@ This package only tries to implement what happens to be needed by the current implementation of SBCL, and makes no guarantees of interface stability." :use ("CL" "SB!ALIEN" "SB!C-CALL" "SB!EXT" "SB!INT" "SB!SYS") - :export ("CADDR-T" "D-INO" "D-NAME" "D-NAMLEN" "D-OFF" "D-RECLEN" - "DADDR-T" "DEV-T" "DIRECT" "EXECGRP" "EXECOTH" "EXECOWN" "F-DUPFD" + :export ("D-INO" "D-NAME" "D-NAMLEN" "D-OFF" "D-RECLEN" + "DEV-T" "DIRECT" "EXECGRP" "EXECOTH" "EXECOWN" "F-DUPFD" "F-GETFD" "F-GETFL" "F-GETOWN" "F-SETFD" "F-SETFL" "F-SETOWN" "FAPPEND" "FASYNC" "FCREAT" "FEXCL" "FIONREAD" "FNDELAY" "FTRUNC" "F_OK" "GID-T" @@ -1493,9 +1493,9 @@ no guarantees of interface stability." "S-IFREG" "S-IFSOCK" "S-IREAD" "S-ISGID" "S-ISUID" "S-ISVTX" "S-IWRITE" "SAVETEXT" "SC-MASK" "SC-ONSTACK" "SC-PC" "SETGIDEXEC" "SETUIDEXEC" "SG-ERASE" "SG-FLAGS" "SG-ISPEED" "SG-KILL" - "SG-OSPEED" "SGTTYB" "SIZE-T" "ST-ATIME" "ST-BLKSIZE" + "SG-OSPEED" "SGTTYB" "ST-ATIME" "ST-BLKSIZE" "ST-BLOCKS" "ST-CTIME" "ST-DEV" "ST-GID" "ST-MODE" "ST-MTIME" - "ST-NLINK" "ST-RDEV" "ST-SIZE" "ST-UID" "STAT" "SWBLK-T" + "ST-NLINK" "ST-RDEV" "ST-SIZE" "ST-UID" "STAT" "TERMINAL-SPEEDS" "TIME-T" "TIMEVAL" "TIMEZONE" "TIOCFLUSH" "TIOCGETC" "TIOCGETP" "TIOCGLTC" "TIOCGPGRP" "TIOCGWINSZ" "TIOCNOTTY" "TIOCSETC" "TIOCSETP" "TIOCSLTC" "TIOCSPGRP" diff --git a/src/code/filesys.lisp b/src/code/filesys.lisp index e33a94f..917b125 100644 --- a/src/code/filesys.lisp +++ b/src/code/filesys.lisp @@ -1025,7 +1025,10 @@ (defun default-directory () #!+sb-doc - "Return the pathname for the default directory. This is the place where + "This is deprecated as of sbcl-0.6.12.18. The ANSI-supported way to do + this kind of thing is to use *DEFAULT-PATHNAME-DEFAULTS*. + + Return the pathname for the default directory. This is the place where a file will be written if no directory is specified. This may be changed with SETF." (multiple-value-bind (gr dir-or-error) (sb!unix:unix-current-directory) @@ -1039,20 +1042,21 @@ (unless namestring (error "~S doesn't exist." new-val)) (multiple-value-bind (gr error) (sb!unix:unix-chdir namestring) - (if gr - (setf (search-list "default:") (default-directory)) - (simple-file-perror "couldn't set default directory to ~S" - new-val - error))) + (unless gr + (simple-file-perror "couldn't set default directory to ~S" + new-val + error))) new-val)) (/show0 "filesys.lisp 934") -(/show0 "entering what used to be !FILESYS-COLD-INIT") +;;; FIXME/REMOVEME: We shouldn't need to do this here, since +;;; *DEFAULT-PATHNAME-DEFAULTS* is now initialized in +;;; OS-COLD-INIT-OR-REINIT. But in sbcl-0.6.12.19 someone is using +;;; this too early for it to be deleted here. I'd like to fix the +;;; #!+:SB-SHOW stuff, then come back to this. -- WHN 2001-05-29 (defvar *default-pathname-defaults* (%make-pathname *unix-host* nil nil nil nil :newest)) -(setf (search-list "default:") (default-directory)) -(/show0 "leaving what used to be !FILESYS-COLD-INIT") (defun ensure-directories-exist (pathspec &key verbose (mode #o777)) #!+sb-doc diff --git a/src/code/unix.lisp b/src/code/unix.lisp index 4750013..14e90a8 100644 --- a/src/code/unix.lisp +++ b/src/code/unix.lisp @@ -107,23 +107,11 @@ (/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) -(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)) -(def-alien-type qaddr-t (* quad-t)) -(def-alien-type daddr-t int) -(def-alien-type caddr-t (* char)) -(def-alien-type swblk-t long) -(def-alien-type size-t unsigned-int) -(def-alien-type ssize-t int) - -;;; FIXME: We shouldn't hand-copy types from header files into Lisp like this -;;; unless we have extreme provocation. Reading directories is not extreme -;;; enough, since it doesn't need to be blindingly fast: we can just implement -;;; those functions in C as a wrapper layer. +;;; FIXME: We shouldn't hand-copy types from header files into Lisp +;;; like this unless we have extreme provocation. Reading directories +;;; is not extreme enough, since it doesn't need to be blindingly +;;; fast: we can just implement those functions in C as a wrapper +;;; layer. (def-alien-type fd-mask unsigned-long) (eval-when (:compile-toplevel :load-toplevel :execute) -- 1.7.10.4