X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=contrib%2Fsb-simple-streams%2Ffile.lisp;h=4cfacd425baab65ca3193e67c49df9f4cde71da2;hb=cea2946076e0dac11eea1c95158e5e2326455dd8;hp=7b71b9dcbd19be84fa2f5830c70517910fcaabca;hpb=4898ef32c639b1c7f4ee13a5ba566ce6debd03e6;p=sbcl.git diff --git a/contrib/sb-simple-streams/file.lisp b/contrib/sb-simple-streams/file.lisp index 7b71b9d..4cfacd4 100644 --- a/contrib/sb-simple-streams/file.lisp +++ b/contrib/sb-simple-streams/file.lisp @@ -115,8 +115,8 @@ ;;; TODO: use this in src/code/fd-stream.lisp:fd-stream-misc-routine ;;; as well, snarf error reporting from there. (defun revert-file (filename original) - (declare (type simple-base-string filename) - (type (or simple-base-string null) original)) + (declare (type simple-string filename) + (type (or simple-string null) original)) ;; We can't do anything unless we know what file were ;; dealing with, and we don't want to do anything ;; strange unless we were writing to the file. @@ -140,8 +140,8 @@ ;;; TODO: use this in src/code/fd-stream.lisp:fd-stream-misc-routine ;;; as well, snarf error reporting from there. (defun delete-original (filename original) - (declare (type simple-base-string filename) - (type (or simple-base-string null) original)) + (declare (type simple-string filename) + (type (or simple-string null) original)) (when original (multiple-value-bind (okay err) (sb-unix:unix-unlink original) (unless okay @@ -267,6 +267,6 @@ (let ((pathname (getf options :filename))) (with-stream-class (probe-simple-stream stream) (add-stream-instance-flags stream :simple) - (when (sb-unix:unix-access (sb-int:unix-namestring pathname nil) sb-unix:f_ok) + (when (sb-unix:unix-access (file-namestring pathname) sb-unix:f_ok) (setf (sm pathname stream) pathname) t))))