/[cmucl]/src/code/fd-stream.lisp
ViewVC logotype

Diff of /src/code/fd-stream.lisp

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.93 by rtoy, Fri Jan 22 06:14:19 2010 UTC revision 1.94 by rtoy, Fri Jan 22 13:28:26 2010 UTC
# Line 1667  Line 1667 
1667                                 (fd-stream-ibuf-head stream)))                                 (fd-stream-ibuf-head stream)))
1668                   #+unicode                   #+unicode
1669                   (if (fd-stream-string-buffer stream)                   (if (fd-stream-string-buffer stream)
1670                       (decf posn (- (fd-stream-string-buffer-len stream)                       ;; The string buffer contains Lisp characters,
1671                                     (fd-stream-string-index stream)))                       ;; not octets!  To figure out how many octets
1672                         ;; have not been already supplied, we need to
1673                         ;; convert them back to the encoded format and
1674                         ;; count the number of octets.
1675                         (decf posn (length
1676                                     (string-encode (subseq (fd-stream-string-buffer stream)
1677                                                            (fd-stream-string-index stream)
1678                                                            (fd-stream-string-buffer-len stream))
1679                                                    (fd-stream-external-format stream))))
1680                       (decf posn (- (fd-stream-ibuf-tail stream)                       (decf posn (- (fd-stream-ibuf-tail stream)
1681                                 (fd-stream-ibuf-head stream))))                                     (fd-stream-ibuf-head stream))))
1682                   (when (fd-stream-unread stream) ;;@@                   (when (fd-stream-unread stream) ;;@@
1683                     (decf posn))                     (decf posn))
1684                   ;; Divide bytes by element size.                   ;; Divide bytes by element size.

Legend:
Removed from v.1.93  
changed lines
  Added in v.1.94

  ViewVC Help
Powered by ViewVC 1.1.5