#include <stdio.h>
#include <fcntl.h>
#include "_scm.h"
+#include "strings.h"
-#include "scm_validate.h"
+#include "validate.h"
#include "fports.h"
#ifdef HAVE_STRING_H
#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
#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;
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,
(SCM port, SCM mode, SCM size),
-"Set the buffering mode for @var{port}. @var{mode} can be:
-@table @code
-@item _IONBF
-non-buffered
-@item _IOLBF
-line buffered
-@item _IOFBF
-block buffered, using a newly allocated buffer of @var{size} bytes.
-If @var{size} is omitted, a default size will be used.
-@end table
-
-
-@deffn primitive fcntl fd/port command [value]
-Apply @var{command} to the specified file descriptor or the underlying
-file descriptor of the specified port. @var{value} is an optional
-integer argument.
-
-Values for @var{command} are:
-
-@table @code
-@item F_DUPFD
-Duplicate a file descriptor
-@item F_GETFD
-Get flags associated with the file descriptor.
-@item F_SETFD
-Set flags associated with the file descriptor to @var{value}.
-@item F_GETFL
-Get flags associated with the open file.
-@item F_SETFL
-Set flags associated with the open file to @var{value}
-@item F_GETOWN
-Get the process ID of a socket's owner, for @code{SIGIO} signals.
-@item F_SETOWN
-Set the process that owns a socket to @var{value}, for @code{SIGIO} signals.
-@item FD_CLOEXEC
-The value used to indicate the "close on exec" flag with @code{F_GETFL} or
-@code{F_SETFL}.
-@end table
-")
+ "Set the buffering mode for @var{port}. @var{mode} can be:\n"
+ "@table @code\n"
+ "@item _IONBF\n"
+ "non-buffered\n"
+ "@item _IOLBF\n"
+ "line buffered\n"
+ "@item _IOFBF\n"
+ "block buffered, using a newly allocated buffer of @var{size} bytes.\n"
+ "If @var{size} is omitted, a default size will be used.\n"
+ "@end table\n"
+ )
#define FUNC_NAME s_scm_setvbuf
{
int cmode, csize;
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))
*/
SCM_DEFINE (scm_open_file, "open-file", 2, 0, 0,
(SCM filename, SCM modes),
-"Open the file whose name is @var{string}, and return a port
-representing that file. The attributes of the port are
-determined by the @var{mode} string. The way in
-which this is interpreted is similar to C stdio:
-
-The first character must be one of the following:
-
-@table @samp
-@item r
-Open an existing file for input.
-@item w
-Open a file for output, creating it if it doesn't already exist
-or removing its contents if it does.
-@item a
-Open a file for output, creating it if it doesn't already exist.
-All writes to the port will go to the end of the file.
-The "append mode" can be turned off while the port is in use
-@pxref{Ports and File Descriptors, fcntl}
-@end table
-
-The following additional characters can be appended:
-
-@table @samp
-@item +
-Open the port for both input and output. E.g., @code{r+}: open
-an existing file for both input and output.
-@item 0
-Create an "unbuffered" port. In this case input and output operations
-are passed directly to the underlying port implementation without
-additional buffering. This is likely to slow down I/O operations.
-The buffering mode can be changed while a port is in use
-@pxref{Ports and File Descriptors, setvbuf}
-@item l
-Add line-buffering to the port. The port output buffer will be
-automatically flushed whenever a newline character is written.
-@end table
-
-In theory we could create read/write ports which were buffered in one
-direction only. However this isn't included in the current interfaces.
-
-If a file cannot be opened with the access requested,
-@code{open-file} throws an exception.")
+ "Open the file whose name is @var{string}, and return a port\n"
+ "representing that file. The attributes of the port are\n"
+ "determined by the @var{mode} string. The way in \n"
+ "which this is interpreted is similar to C stdio:\n\n"
+ "The first character must be one of the following:\n\n"
+ "@table @samp\n"
+ "@item r\n"
+ "Open an existing file for input.\n"
+ "@item w\n"
+ "Open a file for output, creating it if it doesn't already exist\n"
+ "or removing its contents if it does.\n"
+ "@item a\n"
+ "Open a file for output, creating it if it doesn't already exist.\n"
+ "All writes to the port will go to the end of the file.\n"
+ "The \"append mode\" can be turned off while the port is in use\n"
+ "@pxref{Ports and File Descriptors, fcntl}\n"
+ "@end table\n\n"
+ "The following additional characters can be appended:\n\n"
+ "@table @samp\n"
+ "@item +\n"
+ "Open the port for both input and output. E.g., @code{r+}: open\n"
+ "an existing file for both input and output.\n"
+ "@item 0\n"
+ "Create an \"unbuffered\" port. In this case input and output operations\n"
+ "are passed directly to the underlying port implementation without\n"
+ "additional buffering. This is likely to slow down I/O operations.\n"
+ "The buffering mode can be changed while a port is in use\n"
+ "@pxref{Ports and File Descriptors, setvbuf}\n"
+ "@item l\n"
+ "Add line-buffering to the port. The port output buffer will be\n"
+ "automatically flushed whenever a newline character is written.\n"
+ "@end table\n\n"
+ "In theory we could create read/write ports which were buffered in one\n"
+ "direction only. However this isn't included in the current interfaces.\n\n"
+ "If a file cannot be opened with the access requested,\n"
+ "@code{open-file} throws an exception.")
#define FUNC_NAME s_scm_open_file
{
SCM port;
{
int en = errno;
- scm_syserror_msg (FUNC_NAME, "~A: ~S",
+ SCM_SYSERROR_MSG ("~A: ~S",
scm_cons (scm_makfrom0str (strerror (en)),
- scm_cons (filename, SCM_EOL)),
- en);
+ scm_cons (filename, SCM_EOL)), en);
}
port = scm_fdes_to_port (fdes, mode, filename);
return port;
/* 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;
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);
SCM_ALLOW_INTS;
return port;
}
-
+#undef FUNC_NAME
/* Return a lower bound on the number of bytes available for input. */
static int
{
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;
}
static void
-fport_write (SCM port, void *data, size_t size)
+fport_write (SCM port, const void *data, size_t size)
{
scm_port *pt = SCM_PTAB_ENTRY (port);
}
/* 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);
}
}
scm_sysintern ("_IOLBF", SCM_MAKINUM (_IOLBF));
scm_sysintern ("_IONBF", SCM_MAKINUM (_IONBF));
}
+
+/*
+ Local Variables:
+ c-file-style: "gnu"
+ End:
+*/
HCoop / bpt / guile.git / blobdiff