* gsubr.c (scm_gsubr_apply): Added dummy return to avoid compiler

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

diff --git a/libguile/ioext.c b/libguile/ioext.c
index bbf6900..bcf0cd5 100644 (file)
--- a/libguile/ioext.c
+++ b/libguile/ioext.c
@@ -138,6 +138,14 @@ scm_read_delimited_x (delims, buf, gobble, port, start, end)
   return scm_cons (SCM_BOOL_F, scm_long2num (j - cstart));
 }
 
+/*
+ * %read-line uses a port's fgets method for fast line i/o.  It
+ * truncates any terminating newline from its input, and returns
+ * a cons of the string read and its terminating character.  Doing
+ * so makes it easy to implement the hairy `read-line' options
+ * efficiently in Scheme.
+ */
+
 SCM_PROC (s_read_line, "%read-line", 0, 1, 0, scm_read_line);
 
 SCM
@@ -145,6 +153,8 @@ scm_read_line (port)
      SCM port;
 {
   char *s;
+  int slen;
+  SCM line, term;
 
   if (SCM_UNBNDP (port))
     port = scm_cur_inp;
@@ -154,8 +164,27 @@ scm_read_line (port)
                  port, SCM_ARG1, s_read_line);
     }
 
-  s = scm_do_read_line (port);
-  return (s == NULL ? SCM_EOF_VAL : scm_makfrom0str (s));
+  s = scm_do_read_line (port, &slen);
+
+  if (s == NULL)
+    term = line = SCM_EOF_VAL;
+  else
+    {
+      if (s[slen-1] == '\n')
+       {
+         term = SCM_MAKICHR ('\n');
+         line = scm_makfromstr (s, slen-1, 0);
+       }
+      else
+       {
+         /* Fix: we should check for eof on the port before assuming this. */
+         term = SCM_EOF_VAL;
+         line = scm_makfromstr (s, slen, 0);
+       }         
+      free (s);
+    }
+
+  return scm_cons (line, term);
 }
 
 SCM_PROC (s_write_line, "write-line", 1, 1, 0, scm_write_line);