[cmucl-cvs] [git] CMU Common Lisp branch master updated. snapshot-2013-03-a-3-ga1c04fe

[Raymond Toy]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMU Common Lisp".

The branch, master has been updated
       via  a1c04fe77fbea96b5c038547f64a6fff0089ed77 (commit)
      from  f51ee9dc1f66b02f7a9a0826b70550f3bc9fb222 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit a1c04fe77fbea96b5c038547f64a6fff0089ed77
Author: Raymond Toy <toy.raymond at gmail.com>
Date:   Sat Mar 23 10:27:43 2013 -0700

    Fix ticket:79
    
     * Initialize in-length to in-buffer-length, not 0.
     * Added a few more debugging prints.

diff --git a/src/code/fd-stream.lisp b/src/code/fd-stream.lisp
index 7fcd0bc..80e2941 100644
--- a/src/code/fd-stream.lisp
+++ b/src/code/fd-stream.lisp
@@ -260,7 +260,7 @@
   ;; in-buffer-length, but could be less if we reached the
   ;; end-of-file.
   #+unicode
-  (in-length 0 :type index)
+  (in-length in-buffer-length :type index)
   ;;
   ;; Indicates how to handle errors when converting octets to
   ;; characters.  If NIL, then the external format should handle it
@@ -1697,6 +1697,8 @@
 	      (posn errno)
 	    (unix:unix-lseek (fd-stream-fd stream) 0 unix:l_incr)
 	  (declare (type (or (integer 0) null) posn))
+	  #+nil
+	  (format t "lseek returns ~D ~D~%" posn errno)
 	  (cond (posn
 		 ;; Adjust for buffered output:
 		 ;;  If there is any output buffered, the *real* file position
@@ -1716,6 +1718,8 @@
 		 (decf posn (- (fd-stream-ibuf-tail stream)
 			       (fd-stream-ibuf-head stream)))
 
+		 #+nil
+		 (format t "Updated posn = ~D~%" posn)
 		 #+unicode
 		 (when (fd-stream-string-buffer stream)
 		   ;; The string buffer contains Lisp characters,
@@ -1742,6 +1746,7 @@
 		       (progn
 			 (format t "new posn = ~D~%" posn)
 			 (format t "in-buffer-length = ~D~%" in-buffer-length)
+			 (format t "in-length = ~D~%" (fd-stream-in-length stream))
 			 (format t "fd-stream-in-index = ~D~%" (fd-stream-in-index stream))))))
 		 (when (fd-stream-in-buffer stream)
 		   ;; When we have an in-buffer (whether we have a

-----------------------------------------------------------------------

Summary of changes:
 src/code/fd-stream.lisp |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMU Common Lisp