guile/guile-core/libguile ChangeLog ioext.c ioe...

[Gary Houston]

CVSROOT:        /cvs
Module name:    guile
Changes by:     Gary Houston <address@hidden>   01/04/29 06:03:14

Modified files:
        guile-core/libguile: ChangeLog ioext.c ioext.h Makefile.am 
                             init.c 
Added files:
        guile-core/libguile: rw.c rw.h 

Log message:
        * rw.c: new file, implementing C part of module (ice-9 rw).
        (scm_read_string_x_partial): moved from ioext.c
        (scm_init_rw): new proc.
        * rw.h: new file.
        init.c: include rw.h and call scm_init_rw.
        Makefile.am: include rw.c and rw.h.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/guile/guile-core/libguile/rw.c?cvsroot=OldCVS&rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/guile/guile-core/libguile/rw.h?cvsroot=OldCVS&rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/guile/guile-core/libguile/ChangeLog.diff?cvsroot=OldCVS&tr1=1.1370&tr2=1.1371&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/guile/guile-core/libguile/ioext.c.diff?cvsroot=OldCVS&tr1=1.80&tr2=1.81&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/guile/guile-core/libguile/ioext.h.diff?cvsroot=OldCVS&tr1=1.24&tr2=1.25&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/guile/guile-core/libguile/Makefile.am.diff?cvsroot=OldCVS&tr1=1.126&tr2=1.127&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/guile/guile-core/libguile/init.c.diff?cvsroot=OldCVS&tr1=1.117&tr2=1.118&r1=text&r2=text

Patches:
Index: guile/guile-core/libguile/ChangeLog
diff -u guile/guile-core/libguile/ChangeLog:1.1370 
guile/guile-core/libguile/ChangeLog:1.1371
--- guile/guile-core/libguile/ChangeLog:1.1370  Sat Apr 28 10:31:07 2001
+++ guile/guile-core/libguile/ChangeLog Sun Apr 29 06:03:14 2001
@@ -1,3 +1,12 @@
+2001-04-29  Gary Houston  <address@hidden>
+
+       * rw.c: new file, implementing C part of module (ice-9 rw).
+       (scm_read_string_x_partial): moved from ioext.c
+       (scm_init_rw): new proc.
+       * rw.h: new file.
+       init.c: include rw.h and call scm_init_rw.
+       Makefile.am: include rw.c and rw.h.
+
 2001-04-28  Rob Browning  <address@hidden>
 
        * numbers.c: enabled local definition of SCM_FLOBUFLEN until we
Index: guile/guile-core/libguile/Makefile.am
diff -u guile/guile-core/libguile/Makefile.am:1.126 
guile/guile-core/libguile/Makefile.am:1.127
--- guile/guile-core/libguile/Makefile.am:1.126 Sat Mar 17 13:20:20 2001
+++ guile/guile-core/libguile/Makefile.am       Sun Apr 29 06:03:14 2001
@@ -1,6 +1,6 @@
 ## Process this file with Automake to create Makefile.in
 ##
-##     Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
+##     Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
 ##
 ##   This file is part of GUILE.
 ##   
@@ -46,7 +46,7 @@
     hashtab.c hooks.c init.c ioext.c iselect.c keywords.c lang.c list.c        
     \
     load.c macros.c mallocs.c modules.c numbers.c objects.c objprop.c       \
     options.c pairs.c ports.c print.c procprop.c procs.c properties.c       \
-    random.c rdelim.c read.c root.c scmsigs.c script.c simpos.c smob.c      \
+    random.c rdelim.c read.c root.c rw.c scmsigs.c script.c simpos.c smob.c  \
     sort.c srcprop.c stackchk.c stacks.c stime.c strings.c strop.c          \
     strorder.c strports.c struct.c symbols.c tag.c throw.c values.c         \
     variable.c vectors.c version.c vports.c weaks.c
@@ -57,7 +57,7 @@
     gsubr.x guardians.x hash.x hashtab.x hooks.x init.x ioext.x iselect.x   \
     keywords.x lang.x list.x load.x macros.x mallocs.x modules.x \
     numbers.x objects.x objprop.x options.x pairs.x ports.x print.x \
-    procprop.x procs.x properties.x random.x rdelim.x read.x root.x        \
+    procprop.x procs.x properties.x random.x rdelim.x read.x root.x rw.x \
     scmsigs.x script.x simpos.x smob.x sort.x srcprop.x            \
     stackchk.x stacks.x stime.x strings.x strop.x strorder.x strports.x        
    \
     struct.x symbols.x tag.x throw.x values.x variable.x vectors.x         \
@@ -73,7 +73,7 @@
     iselect.doc keywords.doc lang.doc list.doc load.doc macros.doc        \
     mallocs.doc modules.doc numbers.doc objects.doc objprop.doc \
     options.doc pairs.doc ports.doc print.doc procprop.doc        \
-    procs.doc properties.doc random.doc rdelim.doc read.doc root.doc      \
+    procs.doc properties.doc random.doc rdelim.doc read.doc root.doc rw.doc \
     scmsigs.doc script.doc simpos.doc smob.doc sort.doc           \
     srcprop.doc stackchk.doc stacks.doc stime.doc strings.doc strop.doc        
   \
     strorder.doc strports.doc struct.doc symbols.doc tag.doc throw.doc    \
@@ -118,7 +118,7 @@
     iselect.h keywords.h lang.h list.h load.h macros.h mallocs.h modules.h    \
     net_db.h numbers.h objects.h objprop.h options.h pairs.h ports.h posix.h  \
     regex-posix.h print.h procprop.h procs.h properties.h random.h ramap.h    \
-    rdelim.h read.h root.h scmsigs.h validate.h script.h simpos.h smob.h      \
+    rdelim.h read.h root.h rw.h scmsigs.h validate.h script.h simpos.h smob.h \
     snarf.h socket.h sort.h srcprop.h stackchk.h stacks.h stime.h strings.h   \
     strop.h strorder.h strports.h struct.h symbols.h tag.h tags.h threads.h   \
     throw.h unif.h values.h variable.h vectors.h version.h vports.h weaks.h
Index: guile/guile-core/libguile/init.c
diff -u guile/guile-core/libguile/init.c:1.117 
guile/guile-core/libguile/init.c:1.118
--- guile/guile-core/libguile/init.c:1.117      Tue Apr 24 16:31:38 2001
+++ guile/guile-core/libguile/init.c    Sun Apr 29 06:03:14 2001
@@ -114,6 +114,7 @@
 #include "libguile/random.h"
 #include "libguile/rdelim.h"
 #include "libguile/read.h"
+#include "libguile/rw.h"
 #include "libguile/scmsigs.h"
 #include "libguile/script.h"
 #include "libguile/simpos.h"
@@ -588,10 +589,11 @@
 
   scm_load_startup_files ();
 
-  /* this is located here, not from a deep understanding of the
+  /* these are located here, not from a deep understanding of the
      module system, but as a way of avoiding segv and other
      undesirable side effects that arise from various alternatives.  */
   scm_init_rdelim ();
+  scm_init_rw ();
 }
 
 /* Record here whether SCM_BOOT_GUILE_1 has already been called.  This
Index: guile/guile-core/libguile/ioext.c
diff -u guile/guile-core/libguile/ioext.c:1.80 
guile/guile-core/libguile/ioext.c:1.81
--- guile/guile-core/libguile/ioext.c:1.80      Sat Apr 28 10:24:16 2001
+++ guile/guile-core/libguile/ioext.c   Sun Apr 29 06:03:14 2001
@@ -51,118 +51,15 @@
 #include "libguile/fports.h"
 #include "libguile/feature.h"
 #include "libguile/ports.h"
-#include "libguile/root.h"
 #include "libguile/strings.h"
 #include "libguile/validate.h"
 
 #include <fcntl.h>
 
-#ifdef HAVE_STRING_H
-#include <string.h>
-#endif
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
 
-
-#if defined (EAGAIN)
-#define SCM_MAYBE_EAGAIN || errno == EAGAIN
-#else
-#define SCM_MAYBE_EAGAIN
-#endif
-
-#if defined (EWOULDBLOCK)
-#define SCM_MAYBE_EWOULDBLOCK || errno == EWOULDBLOCK
-#else
-#define SCM_MAYBE_EWOULDBLOCK
-#endif
-
-/* MAYBE there is EAGAIN way of defining this macro but now I EWOULDBLOCK.  */
-#define SCM_EBLOCK(errno) \
-   (0 SCM_MAYBE_EAGAIN SCM_MAYBE_EWOULDBLOCK)
-
-SCM_DEFINE (scm_read_string_x_partial, "read-string!/partial", 1, 3, 0,
-           (SCM str, SCM port_or_fdes, SCM start, SCM end),
-           "Read characters from an fport or file descriptor into a\n"
-           "string @var{str}.  This procedure is scsh-compatible\n"
-           "and can efficiently read large strings.  It will:\n\n"
-           "@itemize\n"
-           "@item\n"
-           "attempt to fill the entire string, unless the @var{start}\n"
-           "and/or @var{end} arguments are supplied.  i.e., @var{start}\n"
-           "defaults to 0 and @var{end} defaults to\n"
-           "@code{(string-length str)}\n"
-           "@item\n"
-           "use the current input port if @var{port_or_fdes} is not\n"
-           "supplied.\n" 
-           "@item\n"
-           "read any characters that are currently available,\n"
-           "without waiting for the rest (short reads are possible).\n\n"
-           "@item\n"
-           "wait for as long as it needs to for the first character to\n"
-           "become available, unless the port is in non-blocking mode\n"
-           "@item\n"
-           "return @code{#f} if end-of-file is encountered before reading\n"
-            "any characters, otherwise return the number of characters\n"
-           "read.\n"
-           "@item\n"
-           "return 0 if the port is in non-blocking mode and no characters\n"
-           "are immediately available.\n"
-           "@item\n"
-           "return 0 if the request is for 0 bytes, with no\n"
-           "end-of-file check\n"
-           "@end itemize")
-#define FUNC_NAME s_scm_read_string_x_partial
-{
-  char *dest;
-  long read_len;
-  long chars_read = 0;
-  int fdes;
-
-  {
-    long offset;
-    long last;
-
-    SCM_VALIDATE_SUBSTRING_SPEC_COPY (1, str, dest, 3, start, offset,
-                                     4, end, last);
-    dest += offset;
-    read_len = last - offset;
-  }
-
-  if (SCM_INUMP (port_or_fdes))
-    fdes = SCM_INUM (port_or_fdes);
-  else
-    {
-      SCM port = SCM_UNBNDP (port_or_fdes) ? scm_cur_inp : port_or_fdes;
-
-      SCM_VALIDATE_OPFPORT (2, port);
-      SCM_VALIDATE_INPUT_PORT (2, port);
-
-      /* if there's anything in the port buffers, use it, but then
-        don't touch the file descriptor.  otherwise the
-        "return immediately if something is available" rule may
-        be violated.  */
-      chars_read = scm_take_from_input_buffers (port, dest, read_len);
-      fdes = SCM_FPORT_FDES (port);
-    }
-
-  if (chars_read == 0 && read_len > 0) /* don't confuse read_len == 0 with
-                                         EOF.  */
-    {
-      SCM_SYSCALL (chars_read = read (fdes, dest, read_len));
-      if (chars_read == -1)
-       {
-         if (SCM_EBLOCK (errno))
-           chars_read = 0;
-         else
-           SCM_SYSERROR;
-        }
-      else if (chars_read == 0)
-       return SCM_BOOL_F;
-    }
-  return scm_long2num (chars_read);
-}
-#undef FUNC_NAME
 
 SCM_DEFINE (scm_ftell, "ftell", 1, 0, 0, 
             (SCM fd_port),
Index: guile/guile-core/libguile/ioext.h
diff -u guile/guile-core/libguile/ioext.h:1.24 
guile/guile-core/libguile/ioext.h:1.25
--- guile/guile-core/libguile/ioext.h:1.24      Sat Apr 28 10:24:43 2001
+++ guile/guile-core/libguile/ioext.h   Sun Apr 29 06:03:14 2001
@@ -48,8 +48,6 @@
 
 
 
-extern SCM scm_read_string_x_partial (SCM str, SCM port_or_fdes, SCM start,
-                                     SCM end);
 extern SCM scm_ftell (SCM object);
 extern SCM scm_redirect_port (SCM into_pt, SCM from_pt);
 extern SCM scm_dup_to_fdes (SCM fd_or_port, SCM newfd);