Merge commit 'ed72201a795ac1c8d6c0288b6bb710f2bd0ebd9c'

[bpt/guile.git] / libguile / r6rs-ports.c

diff --git a/libguile/r6rs-ports.c b/libguile/r6rs-ports.c
index 6daa505..2c2b657 100644 (file)
--- a/libguile/r6rs-ports.c
+++ b/libguile/r6rs-ports.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2009, 2010, 2011, 2013, 2014 Free Software Foundation, Inc.
+/* Copyright (C) 2009, 2010, 2011, 2013-2015 Free Software Foundation, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public License
@@ -20,10 +20,7 @@
 # include <config.h>
 #endif
 
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
-
+#include <unistd.h>
 #include <string.h>
 #include <stdio.h>
 #include <assert.h>
@@ -302,9 +299,10 @@ cbip_setvbuf (SCM port, long read_size, long write_size)
   switch (read_size)
     {
     case 0:
-      /* Unbuffered: keep PORT's bytevector as is (it will be used in
-        future 'scm_c_read' calls), but point to the one-byte buffer.  */
-      pt->read_buf = &pt->shortbuf;
+      /* Unbuffered: keep using PORT's bytevector as the underlying
+        buffer (it will also be used by future 'scm_c_read' calls.)  */
+      assert (SCM_BYTEVECTOR_LENGTH (bv) >= 1);
+      pt->read_buf = (unsigned char *) SCM_BYTEVECTOR_CONTENTS (bv);
       pt->read_buf_size = 1;
       break;
 
@@ -387,9 +385,14 @@ cbip_fill_input (SCM port)
        (c_port->read_buf == (unsigned char *) SCM_BYTEVECTOR_CONTENTS (bv));
 
       if (buffered)
-       /* Make sure the buffer isn't corrupt.  BV can be passed directly
-          to READ_PROC.  */
-       assert (c_port->read_buf_size == SCM_BYTEVECTOR_LENGTH (bv));
+       {
+         /* Make sure the buffer isn't corrupt.  Its size can be 1 when
+            someone called 'setvbuf' with _IONBF.  BV can be passed
+            directly to READ_PROC.  */
+         assert (c_port->read_buf_size == SCM_BYTEVECTOR_LENGTH (bv)
+                 || c_port->read_buf_size == 1);
+         c_port->read_pos = (unsigned char *) SCM_BYTEVECTOR_CONTENTS (bv);
+       }
       else
        {
          /* This is an unbuffered port.  When called via the