drop extra 2006-02-06 heading

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

diff --git a/libguile/rdelim.c b/libguile/rdelim.c
index 4e99153..2ce1803 100644 (file)
--- a/libguile/rdelim.c
+++ b/libguile/rdelim.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1995,1996,1997,1998,1999,2000,2001 Free Software Foundation, Inc.
+/* Copyright (C) 1995,1996,1997,1998,1999,2000,2001, 2006 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
@@ -12,7 +12,7 @@
  *
  * 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
  */
 
 #if HAVE_CONFIG_H
@@ -56,21 +56,24 @@ SCM_DEFINE (scm_read_delimited_x, "%read-delimited!", 3, 3, 0,
 #define FUNC_NAME s_scm_read_delimited_x
 {
   size_t j;
-  char *buf;
   size_t cstart;
   size_t cend;
   int c;
-  char *cdelims;
+  const char *cdelims;
   size_t num_delims;
 
-  SCM_VALIDATE_STRING_COPY (1, delims, cdelims);
-  num_delims = SCM_STRING_LENGTH (delims);
-  SCM_VALIDATE_SUBSTRING_SPEC_COPY (2, str, buf, 5, start, cstart,
-                                   6, end, cend);
+  SCM_VALIDATE_STRING (1, delims);
+  cdelims = scm_i_string_chars (delims);
+  num_delims = scm_i_string_length (delims);
+
+  SCM_VALIDATE_STRING (2, str);
+  scm_i_get_substring_spec (scm_i_string_length (str),
+                           start, &cstart, end, &cend);
+
   if (SCM_UNBNDP (port))
-    port = scm_cur_inp;
+    port = scm_current_input_port ();
   else
-    SCM_VALIDATE_OPINPORT (4,port);
+    SCM_VALIDATE_OPINPORT (4, port);
 
   for (j = cstart; j < cend; j++)
     {  
@@ -85,16 +88,16 @@ SCM_DEFINE (scm_read_delimited_x, "%read-delimited!", 3, 3, 0,
                scm_ungetc (c, port);
 
              return scm_cons (SCM_MAKE_CHAR (c),
-                              scm_long2num (j - cstart));
+                              scm_from_size_t (j - cstart));
            }
        }
       if (c == EOF)
        return scm_cons (SCM_EOF_VAL, 
-                        scm_long2num (j - cstart));
+                        scm_from_size_t (j - cstart));
 
-      buf[j] = c;
+      scm_c_string_set_x (str, j, SCM_MAKE_CHAR (c));
     }
-  return scm_cons (SCM_BOOL_F, scm_long2num (j - cstart));
+  return scm_cons (SCM_BOOL_F, scm_from_size_t (j - cstart));
 }
 #undef FUNC_NAME
 
@@ -201,11 +204,11 @@ SCM_DEFINE (scm_read_line, "%read-line", 0, 1, 0,
 {
   scm_t_port *pt;
   char *s;
-  size_t slen;
+  size_t slen = 0;
   SCM line, term;
 
   if (SCM_UNBNDP (port))
-    port = scm_cur_inp;
+    port = scm_current_input_port ();
   SCM_VALIDATE_OPINPORT (1,port);
 
   pt = SCM_PTAB_ENTRY (port);
@@ -222,14 +225,14 @@ SCM_DEFINE (scm_read_line, "%read-line", 0, 1, 0,
        {
          term = SCM_MAKE_CHAR ('\n');
          s[slen-1] = '\0';
-         line = scm_take_str (s, slen-1);
+         line = scm_take_locale_stringn (s, slen-1);
          SCM_INCLINE (port);
        }
       else
        {
          /* Fix: we should check for eof on the port before assuming this. */
          term = SCM_EOF_VAL;
-         line = scm_take_str (s, slen);
+         line = scm_take_locale_stringn (s, slen);
          SCM_COL (port) += slen;
        }
     }