X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcode%2Ffd-stream.lisp;h=6df3f9f8de1796cda6442c4b4f4a2e5c7e3502d3;hb=6cbe4d8ba6d7bc469d03a72514c789b1f3944878;hp=a2e45dd92b585a5324b497e9249c207bfddbcd03;hpb=72408d179d7396904e25e9a3dc423d2634e65072;p=sbcl.git diff --git a/src/code/fd-stream.lisp b/src/code/fd-stream.lisp index a2e45dd..6df3f9f 100644 --- a/src/code/fd-stream.lisp +++ b/src/code/fd-stream.lisp @@ -876,8 +876,7 @@ (type (or index (member nil :start :end)) newpos)) (if (null newpos) (sb!sys:without-interrupts - ;; First, find the position of the UNIX file descriptor in the - ;; file. + ;; First, find the position of the UNIX file descriptor in the file. (multiple-value-bind (posn errno) (sb!unix:unix-lseek (fd-stream-fd stream) 0 sb!unix:l_incr) (declare (type (or index null) posn)) @@ -1124,8 +1123,8 @@ (delete-original (eq if-exists :rename-and-delete)) (mode #o666)) (when original - ;; We are doing a :RENAME or :RENAME-AND-DELETE. - ;; Determine whether the file already exists, make sure the original + ;; We are doing a :RENAME or :RENAME-AND-DELETE. Determine + ;; whether the file already exists, make sure the original ;; file is not a directory, and keep the mode. (let ((exists (and namestring @@ -1154,10 +1153,10 @@ (do-old-rename namestring original)) (setf original nil) (setf delete-original nil) - ;; In order to use :SUPERSEDE instead, we have to make sure - ;; SB!UNIX:O_CREAT corresponds to IF-DOES-NOT-EXIST. - ;; SB!UNIX:O_CREAT was set before because of IF-EXISTS being - ;; :RENAME. + ;; In order to use :SUPERSEDE instead, we have to make + ;; sure SB!UNIX:O_CREAT corresponds to + ;; IF-DOES-NOT-EXIST. SB!UNIX:O_CREAT was set before + ;; because of IF-EXISTS being :RENAME. (unless (eq if-does-not-exist :create) (setf mask (logior (logandc2 mask sb!unix:o_creat) @@ -1273,6 +1272,8 @@ ;;; This is kind of like FILE-POSITION, but is an internal hack used ;;; by the filesys stuff to get and set the file name. +;;; +;;; FIXME: misleading name, screwy interface (defun file-name (stream &optional new-name) (when (typep stream 'fd-stream) (cond (new-name