[cmucl-cvs] [git] CMU Common Lisp branch master updated. snapshot-2013-02-23-ge8f64b3

[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  e8f64b3f83455a82edad394c472481fadde6ccb5 (commit)
      from  fc60a7b508bb1e3fdc6d453f5b92a7f276331d2e (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 e8f64b3f83455a82edad394c472481fadde6ccb5
Author: Raymond Toy <toy.raymond at gmail.com>
Date:   Tue Feb 26 20:44:18 2013 -0800

    Fix ticket:74
    
    When accounting for the octets left in the in-buffer that we haven't
    read (or converted to characters), we were subtracting the index from
    the total in-buffer length.  This is wrong if the file is less than
    the total in-buffer length.  We should have subtracted from the actual
    number of octets in the in-buffer.

diff --git a/src/code/fd-stream.lisp b/src/code/fd-stream.lisp
index e41b331..7fcd0bc 100644
--- a/src/code/fd-stream.lisp
+++ b/src/code/fd-stream.lisp
@@ -1756,8 +1756,9 @@
 		   #+nil
 		   (progn
 		     (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)))
-		   (decf posn (- in-buffer-length
+		   (decf posn (- (fd-stream-in-length stream)
 				 (fd-stream-in-index stream))))
 		 #+nil
 		 (format t "fd-stream-unread = ~S~%" (fd-stream-unread stream))

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

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


hooks/post-receive
-- 
CMU Common Lisp