*** empty log message ***

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

diff --git a/libguile/fports.c b/libguile/fports.c
index ad3295e..5660fa8 100644 (file)
--- a/libguile/fports.c
+++ b/libguile/fports.c
@@ -48,7 +48,7 @@
 #include <fcntl.h>
 #include "_scm.h"
 
-#include "scm_validate.h"
+#include "validate.h"
 #include "fports.h"
 
 #ifdef HAVE_STRING_H
@@ -67,6 +67,9 @@ scm_sizet fwrite ();
 
 #include "iselect.h"
 
+/* default buffer size, used if the O/S won't supply a value.  */
+static const int default_buffer_size = 1024;
+
 /* create FPORT buffer with specified sizes (or -1 to use default size or
    0 for no buffer.  */
 static void
@@ -82,11 +85,10 @@ scm_fport_buffer_add (SCM port, int read_size, int write_size)
 #ifdef HAVE_ST_BLKSIZE
       struct stat st;
       
-      if (fstat (fp->fdes, &st) == -1)
-       scm_syserror (s_scm_fport_buffer_add);
-      default_size = st.st_blksize;
+      default_size = (fstat (fp->fdes, &st) == -1) ? default_buffer_size
+       : st.st_blksize;
 #else
-      default_size = 1024;
+      default_size = default_buffer_size;
 #endif
       if (read_size == -1)
        read_size = default_size;
@@ -124,9 +126,9 @@ scm_fport_buffer_add (SCM port, int read_size, int write_size)
 
   pt->write_end = pt->write_buf + pt->write_buf_size;
   if (read_size > 0 || write_size > 0)
-    SCM_SETCAR (port, SCM_CAR (port) & ~SCM_BUF0);
+    SCM_SETCAR (port, SCM_UNPACK_CAR (port) & ~SCM_BUF0);
   else
-    SCM_SETCAR (port, (SCM_CAR (port) | SCM_BUF0));
+    SCM_SETCAR (port, (SCM_UNPACK_CAR (port) | SCM_BUF0));
 }
 
 SCM_DEFINE (scm_setvbuf, "setvbuf", 2, 1, 0, 
@@ -180,12 +182,12 @@ SCM_DEFINE (scm_setvbuf, "setvbuf", 2, 1, 0,
 
   if (cmode == _IOLBF)
     {
-      SCM_SETCAR (port, SCM_CAR (port) | SCM_BUFLINE);
+      SCM_SETCAR (port, SCM_UNPACK_CAR (port) | SCM_BUFLINE);
       cmode = _IOFBF;
     }
   else
     {
-      SCM_SETCAR (port, SCM_CAR (port) ^ SCM_BUFLINE);
+      SCM_SETCAR (port, SCM_UNPACK_CAR (port) ^ SCM_BUFLINE);
     }
 
   if (SCM_UNBNDP (size))
@@ -359,14 +361,28 @@ SCM_DEFINE (scm_open_file, "open-file", 2, 0, 0,
 /* Build a Scheme port from an open file descriptor `fdes'.
    MODE indicates whether FILE is open for reading or writing; it uses
       the same notation as open-file's second argument.
-   Use NAME as the port's filename.  */
-
+   NAME is a string to be used as the port's filename.
+*/
 SCM
 scm_fdes_to_port (int fdes, char *mode, SCM name)
+#define FUNC_NAME "scm_fdes_to_port"
 {
   long mode_bits = scm_mode_bits (mode);
   SCM port;
   scm_port *pt;
+  int flags;
+
+  /* test that fdes is valid.  */
+  flags = fcntl (fdes, F_GETFL, 0);
+  if (flags == -1)
+    SCM_SYSERROR;
+  flags &= O_ACCMODE;
+  if (flags != O_RDWR
+      && ((flags != O_WRONLY && (mode_bits & SCM_WRTNG))
+         || (flags != O_RDONLY && (mode_bits & SCM_RDNG))))
+    {
+      SCM_MISC_ERROR ("requested file mode not available on fdes", SCM_EOL);
+    }
 
   SCM_NEWCELL (port);
   SCM_DEFER_INTS;
@@ -378,7 +394,7 @@ scm_fdes_to_port (int fdes, char *mode, SCM name)
     struct scm_fport *fp
       = (struct scm_fport *) malloc (sizeof (struct scm_fport));
     if (fp == NULL)
-      scm_memory_error ("scm_fdes_to_port");
+      SCM_MEMORY_ERROR;
     fp->fdes = fdes;
     pt->rw_random = SCM_FDES_RANDOM_P (fdes);
     SCM_SETSTREAM (port, fp);
@@ -391,7 +407,7 @@ scm_fdes_to_port (int fdes, char *mode, SCM name)
   SCM_ALLOW_INTS;
   return port;
 }
-
+#undef FUNC_NAME
 
 /* Return a lower bound on the number of bytes available for input.  */
 static int
@@ -456,7 +472,7 @@ prinfport (SCM exp,SCM port,scm_print_state *pstate)
     {
       scm_puts (SCM_PTOBNAME (SCM_PTOBNUM (exp)), port);
       scm_putc (' ', port);
-      scm_intprint (SCM_CDR (exp), 16, port);
+      scm_intprint (SCM_UNPACK (SCM_CDR (exp)), 16, port);
     }
   scm_putc ('>', port);
   return 1;
@@ -610,7 +626,7 @@ fport_write (SCM port, const void *data, size_t size)
        }
 
       /* handle line buffering.  */
-      if ((SCM_CAR (port) & SCM_BUFLINE) && memchr (data, '\n', size))
+      if ((SCM_UNPACK_CAR (port) & SCM_BUFLINE) && memchr (data, '\n', size))
        fport_flush (port);
     }
 }