Changeset 4900

Timestamp:

Jul 23, 2006, 1:56:17 AM (18 years ago)

Author:

Gary Byers

Message:

STREAM-IOBLOCK now takes 2 required args.

Location:

trunk/ccl/level-1

Files:

• l1-sockets.lisp (modified) (2 diffs)
• l1-sysio.lisp (modified) (3 diffs)
• linux-files.lisp (modified) (2 diffs)

trunk/ccl/level-1/l1-sockets.lisp

@@ -291 +291 @@
 
 
-;; An active TCP socket is an honest-to-goodness stream.
+;;; An active TCP socket is an honest-to-goodness stream.
 (defclass tcp-stream (tcp-socket fd-stream
                                  buffered-binary-io-stream-mixin
@@ -317 +317 @@
 
 (defmethod socket-device ((stream tcp-stream))
-  (let ((ioblock (stream-ioblock stream)))
+  (let ((ioblock (stream-ioblock stream nil)))
     (and ioblock (ioblock-device ioblock))))
 

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

@@ -301 +301 @@
       (format out "(~s/" (stream-filename s))
       (if file-ioblock
-        (format out "~d)" (file-ioblock-device (stream-ioblock s)))
+        (format out "~d)" (file-ioblock-device file-ioblock))
         (format out ":closed")))))
             
@@ -471 +471 @@
 (defmethod close ((s file-stream) &key abort)
   (when (open-stream-p s)
-    (let* ((ioblock (stream-ioblock s))
+    (let* ((ioblock (stream-ioblock s t))
            (filename (stream-filename s))
            (actual-filename (stream-actual-filename s)))
@@ -614 +614 @@
                                :device fd
                                :external-format real-external-format
-                               :sharing sharing))
-                     (ioblock (stream-ioblock fstream)))
+                               :sharing sharing
+                               :character-p (or (eq element-type 'character)
+                                                (subtypep element-type 'character))))
+                     (ioblock (stream-ioblock fstream t)))
                 (setf (stream-filename fstream) (namestring pathname)
                       (stream-actual-filename fstream) temp-name)

trunk/ccl/level-1/linux-files.lisp

@@ -677 +677 @@
     ((or pathname string)
      (with-open-stream (file (apply #'open object keys))
-       (let* ((fd (fd-dup (ioblock-device (stream-ioblock file)))))
+       (let* ((fd (fd-dup (ioblock-device (stream-ioblock file t)))))
          (values fd
                  nil
@@ -683 +683 @@
                  (cons fd close-on-error)))))
     (fd-stream
-     (let ((fd (fd-dup (ioblock-device (stream-ioblock object)))))
+     (let ((fd (fd-dup (ioblock-device (stream-ioblock object t)))))
        (values fd
                nil