Changeset 11059 for trunk/source/level-1/l1-sysio.lisp

Timestamp:

Oct 12, 2008, 8:07:56 AM (11 years ago)

Author:

gb

Message:

In the FILE-IOBLOCK defstruct: don't claim that OCTET-POS and FILEEOF
slots are of :type fixnum.

In STREAM-LENGTH methods on FILE-STREAM, return NIL if the ioblock
function returns a negative value (which generally means "we got
an error trying to determine the length of the file.")

File:

• trunk/source/level-1/l1-sysio.lisp (modified) (3 diffs)

trunk/source/level-1/l1-sysio.lisp

@@ -18 +18 @@
 
 (defstruct (file-ioblock (:include ioblock))
-  (octet-pos 0 :type fixnum)            ; current io position in octets
-  (fileeof 0 :type fixnum)              ; file length in elements
+  (octet-pos 0 )                       ; current io position in octets
+  (fileeof 0 )                          ; file length in elements
   )
 
@@ -590 +590 @@
 (defmethod stream-length ((stream fundamental-file-input-stream) &optional newlen)
   (with-stream-ioblock-input (file-ioblock stream :speedy t)
-    (%ioblock-input-file-length file-ioblock newlen)))
+    (let* ((res (%ioblock-input-file-length file-ioblock newlen)))
+      (and res (>= res 0) res))))
+
 
 (defmethod stream-length ((stream basic-file-input-stream) &optional newlen)
   (let* ((file-ioblock (basic-stream-ioblock stream)))
     (with-ioblock-input-locked (file-ioblock)
-      (%ioblock-input-file-length file-ioblock newlen))))
+      (let* ((res (%ioblock-input-file-length file-ioblock newlen)))
+        (and res (>= res 0) res)))))
 
 
 (defmethod stream-length ((s fundamental-file-output-stream) &optional newlen)
   (with-stream-ioblock-output (file-ioblock s :speedy t)
-    (%ioblock-output-file-length file-ioblock newlen)))
+    (let* ((res (%ioblock-output-file-length file-ioblock newlen)))
+      (and res (>= res 0) res))))
 
 
@@ -606 +610 @@
   (let* ((file-ioblock (basic-stream-ioblock stream)))
     (with-ioblock-output-locked (file-ioblock)
-      (%ioblock-output-file-length file-ioblock newlen))))
+      (let* ((res (%ioblock-output-file-length file-ioblock newlen)))
+        (and res (>= res 0) res)))))
 
 (defmethod stream-length ((s fundamental-file-io-stream) &optional newlen)
   (with-stream-ioblock-input (file-ioblock s :speedy t)
-    (%ioblock-output-file-length file-ioblock newlen)))
+    (let* ((res (%ioblock-output-file-length file-ioblock newlen)))
+      (and res (>= res 0) res))))
 
 (defmethod stream-length ((stream basic-file-io-stream) &optional newlen)
   (let* ((file-ioblock (basic-stream-ioblock stream)))
     (with-ioblock-input-locked (file-ioblock)
-      (%ioblock-output-file-length file-ioblock newlen))))
+      (let* ((res (%ioblock-output-file-length file-ioblock newlen)))
+        (and res (>= res 0) res)))))
 
 (defun close-file-stream (s abort)