CMUCL commit: RELEASE-20B-BRANCH src/code (fd-stream.lisp)

[Raymond Toy]

    Date: Wednesday, August 18, 2010 @ 13:31:52
  Author: rtoy
    Path: /project/cmucl/cvsroot/src/code
     Tag: RELEASE-20B-BRANCH

Modified: fd-stream.lisp

Merge fix from HEAD for FILE-POSITION.


----------------+
 fd-stream.lisp |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)


Index: src/code/fd-stream.lisp
diff -u src/code/fd-stream.lisp:1.114.2.1 src/code/fd-stream.lisp:1.114.2.2
--- src/code/fd-stream.lisp:1.114.2.1	Sun Aug 15 11:07:51 2010
+++ src/code/fd-stream.lisp	Wed Aug 18 13:31:51 2010
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /project/cmucl/cvsroot/src/code/fd-stream.lisp,v 1.114.2.1 2010-08-15 15:07:51 rtoy Exp $")
+  "$Header: /project/cmucl/cvsroot/src/code/fd-stream.lisp,v 1.114.2.2 2010-08-18 17:31:51 rtoy Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -1716,9 +1716,10 @@
 			 ;; Note: string-index starts at 1 (because
 			 ;; index 0 is for the unread-char), but
 			 ;; octet-count doesn't use that.  Hence,
-			 ;; subtract one from string-index.
+			 ;; subtract one from string-index and
+			 ;; string-buffer-len.
 			 (loop for k of-type fixnum from (1- (fd-stream-string-index stream))
-			    below (fd-stream-string-buffer-len stream)
+			    below (1- (fd-stream-string-buffer-len stream))
 			    do (decf posn (aref ocount k)))))
 		     (decf posn (- (fd-stream-ibuf-tail stream)
 				   (fd-stream-ibuf-head stream))))