Add a missing SYNC_ALL in variable-ref

[bpt/guile.git] / libguile / rw.c

diff --git a/libguile/rw.c b/libguile/rw.c
index 94f813b..a9b4a32 100644 (file)
--- a/libguile/rw.c
+++ b/libguile/rw.c
@@ -1,25 +1,26 @@
-/*     Copyright (C) 2001 Free Software Foundation, Inc.
+/*     Copyright (C) 2001, 2006, 2009 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 as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 3 of
+ * the License, or (at your option) any later version.
  *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * This library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301 USA
  */
 
 \f
 
 /* This is the C part of the (ice-9 rw) module.  */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 #  include <config.h>
 #endif
 
@@ -102,17 +103,17 @@ SCM_DEFINE (scm_read_string_x_partial, "read-string!/partial", 1, 3, 0,
 #define FUNC_NAME s_scm_read_string_x_partial
 {
   char *dest;
+  size_t offset;
   long read_len;
   long chars_read = 0;
   int fdes;
 
   {
-    long offset;
-    long last;
+    size_t last;
 
-    SCM_VALIDATE_SUBSTRING_SPEC_COPY (1, str, dest, 3, start, offset,
-                                     4, end, last);
-    dest += offset;
+    SCM_VALIDATE_STRING (1, str);
+    scm_i_get_substring_spec (scm_i_string_length (str),
+                             start, &offset, end, &last);
     read_len = last - offset;
   }
 
@@ -120,7 +121,8 @@ SCM_DEFINE (scm_read_string_x_partial, "read-string!/partial", 1, 3, 0,
     fdes = scm_to_int (port_or_fdes);
   else
     {
-      SCM port = SCM_UNBNDP (port_or_fdes) ? scm_cur_inp : port_or_fdes;
+      SCM port = (SCM_UNBNDP (port_or_fdes)?
+                 scm_current_input_port () : port_or_fdes);
 
       SCM_VALIDATE_OPFPORT (2, port);
       SCM_VALIDATE_INPUT_PORT (2, port);
@@ -129,14 +131,20 @@ SCM_DEFINE (scm_read_string_x_partial, "read-string!/partial", 1, 3, 0,
         don't touch the file descriptor.  otherwise the
         "return immediately if something is available" rule may
         be violated.  */
+      str = scm_i_string_start_writing (str);
+      dest = scm_i_string_writable_chars (str) + offset;
       chars_read = scm_take_from_input_buffers (port, dest, read_len);
+      scm_i_string_stop_writing ();
       fdes = SCM_FPORT_FDES (port);
     }
 
   if (chars_read == 0 && read_len > 0) /* don't confuse read_len == 0 with
                                          EOF.  */
     {
+      str = scm_i_string_start_writing (str);
+      dest = scm_i_string_writable_chars (str) + offset;
       SCM_SYSCALL (chars_read = read (fdes, dest, read_len));
+      scm_i_string_stop_writing ();
       if (chars_read == -1)
        {
          if (SCM_EBLOCK (errno))
@@ -145,8 +153,13 @@ SCM_DEFINE (scm_read_string_x_partial, "read-string!/partial", 1, 3, 0,
            SCM_SYSERROR;
         }
       else if (chars_read == 0)
-       return SCM_BOOL_F;
+       {
+         scm_remember_upto_here_1 (str);
+         return SCM_BOOL_F;
+       }
     }
+
+  scm_remember_upto_here_1 (str);
   return scm_from_long (chars_read);
 }
 #undef FUNC_NAME
@@ -195,16 +208,18 @@ SCM_DEFINE (scm_write_string_partial, "write-string/partial", 1, 3, 0,
            "@end itemize")
 #define FUNC_NAME s_scm_write_string_partial
 {
-  char *src;
-  long write_len;
+  const char *src;
+  scm_t_off write_len;
   int fdes;
 
   {
-    long offset;
-    long last;
+    size_t offset;
+    size_t last;
 
-    SCM_VALIDATE_SUBSTRING_SPEC_COPY (1, str, src, 3, start, offset,
-                                     4, end, last);
+    SCM_VALIDATE_STRING (1, str);
+    src = scm_i_string_chars (str);
+    scm_i_get_substring_spec (scm_i_string_length (str),
+                             start, &offset, end, &last);
     src += offset;
     write_len = last - offset;
   }
@@ -216,9 +231,10 @@ SCM_DEFINE (scm_write_string_partial, "write-string/partial", 1, 3, 0,
     fdes = scm_to_int (port_or_fdes);
   else
     {
-      SCM port = SCM_UNBNDP (port_or_fdes) ? scm_cur_outp : port_or_fdes;
+      SCM port = (SCM_UNBNDP (port_or_fdes)?
+                 scm_current_output_port () : port_or_fdes);
       scm_t_port *pt;
-      off_t space;
+      scm_t_off space;
 
       SCM_VALIDATE_OPFPORT (2, port);
       SCM_VALIDATE_OUTPUT_PORT (2, port);
@@ -246,7 +262,8 @@ SCM_DEFINE (scm_write_string_partial, "write-string/partial", 1, 3, 0,
        else
          SCM_SYSERROR;
       }
-    
+
+    scm_remember_upto_here_1 (str);
     return scm_from_long (rv);
   }
 }