-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1995, 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
#include <stdio.h>
#include "_scm.h"
-#include "genio.h"
+#include "ports.h"
#include "read.h"
#include "fports.h"
#include "unif.h"
#include "ioext.h"
+#include <fcntl.h>
+
#ifdef HAVE_STRING_H
#include <string.h>
#endif
{
int k;
- c = scm_gen_getc (port);
+ c = scm_getc (port);
for (k = 0; k < num_delims; k++)
{
if (cdelims[k] == c)
{
if (SCM_FALSEP (gobble))
- scm_gen_ungetc (c, port);
+ scm_ungetc (c, port);
return scm_cons (SCM_MAKICHR (c),
scm_long2num (j - cstart));
return scm_cons (SCM_BOOL_F, scm_long2num (j - cstart));
}
+static unsigned char *
+scm_do_read_line (SCM port, int *len_p)
+{
+ scm_port *pt = SCM_PTAB_ENTRY (port);
+ unsigned char *end;
+
+ /* I thought reading lines was simple. Mercy me. */
+
+ /* The common case: the buffer contains a complete line.
+ This needs to be fast. */
+ if ((end = memchr (pt->read_pos, '\n', (pt->read_end - pt->read_pos)))
+ != 0)
+ {
+ int buf_len = (end + 1) - pt->read_pos;
+ /* Allocate a buffer of the perfect size. */
+ unsigned char *buf = scm_must_malloc (buf_len + 1, "%read-line");
+
+ memcpy (buf, pt->read_pos, buf_len);
+ pt->read_pos += buf_len;
+
+ buf[buf_len] = '\0';
+
+ *len_p = buf_len;
+ return buf;
+ }
+
+ /* The buffer contains no newlines. */
+ {
+ /* When live, len is always the number of characters in the
+ current buffer that are part of the current line. */
+ int len = (pt->read_end - pt->read_pos);
+ int buf_size = (len < 50) ? 60 : len * 2;
+ /* Invariant: buf always has buf_size + 1 characters allocated;
+ the `+ 1' is for the final '\0'. */
+ unsigned char *buf = scm_must_malloc (buf_size + 1, "%read-line");
+ int buf_len = 0;
+
+ for (;;)
+ {
+ if (buf_len + len > buf_size)
+ {
+ int new_size = (buf_len + len) * 2;
+ buf = scm_must_realloc (buf, buf_size + 1, new_size + 1,
+ "%read-line");
+ buf_size = new_size;
+ }
+
+ /* Copy what we've got out of the port, into our buffer. */
+ memcpy (buf + buf_len, pt->read_pos, len);
+ buf_len += len;
+ pt->read_pos += len;
+
+ /* If we had seen a newline, we're done now. */
+ if (end)
+ break;
+
+ /* Get more characters. */
+ if (scm_fill_input (port) == EOF)
+ {
+ /* If we're missing a final newline in the file, return
+ what we did get, sans newline. */
+ if (buf_len > 0)
+ break;
+
+ free (buf);
+ return 0;
+ }
+
+ /* Search the buffer for newlines. */
+ if ((end = memchr (pt->read_pos, '\n',
+ (len = (pt->read_end - pt->read_pos))))
+ != 0)
+ len = (end - pt->read_pos) + 1;
+ }
+
+ /* I wonder how expensive this realloc is. */
+ buf = scm_must_realloc (buf, buf_size + 1, buf_len + 1, "%read-line");
+ buf[buf_len] = '\0';
+ *len_p = buf_len;
+ return buf;
+ }
+}
+
+
+/*
+ * %read-line
+ * 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
+scm_read_line (port)
+ SCM port;
+{
+ scm_port *pt;
+ char *s;
+ int slen;
+ SCM line, term;
+
+ if (SCM_UNBNDP (port))
+ port = scm_cur_inp;
+ else
+ {
+ SCM_ASSERT (SCM_NIMP (port) && SCM_OPINPORTP (port),
+ port, SCM_ARG1, s_read_line);
+ }
+
+ pt = SCM_PTAB_ENTRY (port);
+ if (pt->rw_active == SCM_PORT_WRITE)
+ scm_ptobs[SCM_PTOBNUM (port)].flush (port);
+
+ 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');
+ s[slen-1] = '\0';
+ line = scm_take_str (s, slen-1);
+ scm_done_malloc (-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);
+ SCM_COL (port) += slen;
+ }
+ }
+
+ if (pt->rw_random)
+ pt->rw_active = SCM_PORT_READ;
+
+ return scm_cons (line, term);
+}
+
SCM_PROC (s_write_line, "write-line", 1, 1, 0, scm_write_line);
SCM
SCM_PROC (s_ftell, "ftell", 1, 0, 0, scm_ftell);
SCM
-scm_ftell (port)
- SCM port;
+scm_ftell (object)
+ SCM object;
{
- long pos;
- SCM_ASSERT (SCM_NIMP (port) && SCM_OPFPORTP (port), port, SCM_ARG1, s_ftell);
- SCM_SYSCALL (pos = ftell ((FILE *)SCM_STREAM (port)));
- if (pos < 0)
- scm_syserror (s_ftell);
- if (pos > 0 && SCM_CRDYP (port))
- pos--;
- return scm_long2num (pos);
+ return scm_seek (object, SCM_INUM0, SCM_MAKINUM (SEEK_CUR));
}
-
-
SCM_PROC (s_fseek, "fseek", 3, 0, 0, scm_fseek);
SCM
-scm_fseek (port, offset, whence)
- SCM port;
+scm_fseek (object, offset, whence)
+ SCM object;
SCM offset;
SCM whence;
{
- int rv;
- long loff;
+ scm_seek (object, offset, whence);
- SCM_ASSERT (SCM_NIMP (port) && SCM_OPFPORTP (port), port, SCM_ARG1, s_fseek);
- loff = scm_num2long (offset, (char *)SCM_ARG2, s_fseek);
- SCM_ASSERT (SCM_INUMP (whence) && (SCM_INUM (whence) < 3) && (SCM_INUM (whence) >= 0),
- whence, SCM_ARG3, s_fseek);
-
- SCM_CLRDY (port); /* Clear ungetted char */
- /* Values of whence are interned in scm_init_ioext. */
- rv = fseek ((FILE *)SCM_STREAM (port), loff, SCM_INUM (whence));
- if (rv != 0)
- scm_syserror (s_fseek);
return SCM_UNSPECIFIED;
}
-
-
-SCM_PROC (s_freopen, "freopen", 3, 0, 0, scm_freopen);
-
-SCM
-scm_freopen (filename, modes, port)
- SCM filename;
- SCM modes;
- SCM port;
-{
- FILE *f;
- SCM_ASSERT (SCM_NIMP (filename) && SCM_ROSTRINGP (filename), filename,
- SCM_ARG1, s_freopen);
- SCM_ASSERT (SCM_NIMP (modes) && SCM_ROSTRINGP (modes), modes, SCM_ARG2,
- s_freopen);
-
- SCM_COERCE_SUBSTR (filename);
- SCM_COERCE_SUBSTR (modes);
- SCM_DEFER_INTS;
- SCM_ASSERT (SCM_NIMP (port) && SCM_FPORTP (port), port, SCM_ARG3, s_freopen);
- SCM_SYSCALL (f = freopen (SCM_ROCHARS (filename), SCM_ROCHARS (modes),
- (FILE *)SCM_STREAM (port)));
- if (!f)
- {
- SCM p;
- p = port;
- port = SCM_MAKINUM (errno);
- SCM_SETAND_CAR (p, ~SCM_OPN);
- scm_remove_from_port_table (p);
- }
- else
- {
- SCM_SETCAR (port, scm_tc16_fport | scm_mode_bits (SCM_ROCHARS (modes)));
- SCM_SETSTREAM (port, (SCM)f);
- SCM_SETCAR (port, scm_tc16_fport | scm_mode_bits (SCM_ROCHARS (modes)));
- if (SCM_BUF0 & SCM_CAR (port))
- scm_setbuf0 (port);
- }
- SCM_ALLOW_INTS;
- return port;
-}
-
SCM_PROC (s_redirect_port, "redirect-port", 2, 0, 0, scm_redirect_port);
SCM
SCM new;
{
int ans, oldfd, newfd;
+ struct scm_fport *fp;
- SCM_DEFER_INTS;
- SCM_ASSERT (SCM_NIMP (old) && SCM_OPPORTP (old), old, SCM_ARG1, s_redirect_port);
- SCM_ASSERT (SCM_NIMP (new) && SCM_OPPORTP (new), new, SCM_ARG2, s_redirect_port);
- oldfd = fileno ((FILE *)SCM_STREAM (old));
- if (oldfd == -1)
- scm_syserror (s_redirect_port);
- newfd = fileno ((FILE *)SCM_STREAM (new));
- if (newfd == -1)
- scm_syserror (s_redirect_port);
- SCM_SYSCALL (ans = dup2 (oldfd, newfd));
- if (ans == -1)
- scm_syserror (s_redirect_port);
- SCM_ALLOW_INTS;
- return SCM_UNSPECIFIED;
-}
+ old = SCM_COERCE_OUTPORT (old);
+ new = SCM_COERCE_OUTPORT (new);
-SCM_PROC (s_primitive_dup, "primitive-dup", 1, 0, 0, scm_primitive_dup);
-SCM
-scm_primitive_dup (SCM fd_or_port)
-{
- int fd, newfd;
-
- SCM_DEFER_INTS;
- if (SCM_INUMP (fd_or_port))
- fd = SCM_INUM (fd_or_port);
- else
+ SCM_ASSERT (SCM_NIMP (old) && SCM_OPFPORTP (old), old, SCM_ARG1, s_redirect_port);
+ SCM_ASSERT (SCM_NIMP (new) && SCM_OPFPORTP (new), new, SCM_ARG2, s_redirect_port);
+ oldfd = SCM_FPORT_FDES (old);
+ fp = SCM_FSTREAM (new);
+ newfd = fp->fdes;
+ if (oldfd != newfd)
{
- SCM_ASSERT (SCM_NIMP (fd_or_port) && SCM_OPPORTP (fd_or_port),
- fd_or_port, SCM_ARG1, s_primitive_dup);
- fd = fileno ((FILE *)SCM_STREAM (fd_or_port));
- if (fd == -1)
- scm_syserror (s_primitive_dup);
+ scm_port *pt = SCM_PTAB_ENTRY (new);
+ scm_port *old_pt = SCM_PTAB_ENTRY (old);
+ scm_ptob_descriptor *ptob = &scm_ptobs[SCM_PTOBNUM (new)];
+
+ /* must flush to old fdes. */
+ if (pt->rw_active == SCM_PORT_WRITE)
+ ptob->flush (new);
+ else if (pt->rw_active == SCM_PORT_READ)
+ scm_end_input (new);
+ ans = dup2 (oldfd, newfd);
+ if (ans == -1)
+ scm_syserror (s_redirect_port);
+ pt->rw_random = old_pt->rw_random;
+ /* continue using existing buffers, even if inappropriate. */
}
- SCM_SYSCALL (newfd = dup (fd));
- if (newfd == -1)
- scm_syserror (s_primitive_dup);
- SCM_ALLOW_INTS;
- return SCM_MAKINUM (newfd);
+ return SCM_UNSPECIFIED;
}
-SCM_PROC (s_primitive_dup2, "primitive-dup2", 2, 0, 0, scm_primitive_dup2);
+SCM_PROC (s_dup_to_fdes, "dup->fdes", 1, 1, 0, scm_dup_to_fdes);
SCM
-scm_primitive_dup2 (SCM fd_or_port, SCM fd)
+scm_dup_to_fdes (SCM fd_or_port, SCM fd)
{
int oldfd, newfd, rv;
- SCM_DEFER_INTS;
+ fd_or_port = SCM_COERCE_OUTPORT (fd_or_port);
+
if (SCM_INUMP (fd_or_port))
oldfd = SCM_INUM (fd_or_port);
else
{
- SCM_ASSERT (SCM_NIMP (fd_or_port) && SCM_OPPORTP (fd_or_port),
- fd_or_port, SCM_ARG1, s_primitive_dup2);
- oldfd = fileno ((FILE *)SCM_STREAM (fd_or_port));
- if (oldfd == -1)
- scm_syserror (s_primitive_dup2);
+ SCM_ASSERT (SCM_NIMP (fd_or_port) && SCM_OPFPORTP (fd_or_port),
+ fd_or_port, SCM_ARG1, s_dup_to_fdes);
+ oldfd = SCM_FPORT_FDES (fd_or_port);
}
-
- SCM_ASSERT (SCM_INUMP (fd), fd, SCM_ARG2, s_primitive_dup2);
- newfd = SCM_INUM (fd);
- if (oldfd == newfd)
+
+ if (SCM_UNBNDP (fd))
{
- SCM_ALLOW_INTS;
- return fd;
+ newfd = dup (oldfd);
+ if (newfd == -1)
+ scm_syserror (s_dup_to_fdes);
+ fd = SCM_MAKINUM (newfd);
+ }
+ else
+ {
+ SCM_ASSERT (SCM_INUMP (fd), fd, SCM_ARG2, s_dup_to_fdes);
+ newfd = SCM_INUM (fd);
+ if (oldfd != newfd)
+ {
+ scm_evict_ports (newfd); /* see scsh manual. */
+ rv = dup2 (oldfd, newfd);
+ if (rv == -1)
+ scm_syserror (s_dup_to_fdes);
+ }
}
- scm_evict_ports (newfd); /* see scsh manual. */
- SCM_SYSCALL (rv = dup2 (oldfd, newfd));
- if (rv == -1)
- scm_syserror (s_primitive_dup2);
- SCM_ALLOW_INTS;
return fd;
}
scm_fileno (port)
SCM port;
{
- int fd;
- SCM_ASSERT (SCM_NIMP (port) && SCM_OPFPORTP (port), port, SCM_ARG1, s_fileno);
- fd = fileno ((FILE *)SCM_STREAM (port));
- if (fd == -1)
- scm_syserror (s_fileno);
- return SCM_MAKINUM (fd);
+ port = SCM_COERCE_OUTPORT (port);
+ SCM_ASSERT (SCM_NIMP (port) && SCM_OPFPORTP (port), port, SCM_ARG1,
+ s_fileno);
+ return SCM_MAKINUM (SCM_FPORT_FDES (port));
}
SCM_PROC (s_isatty, "isatty?", 1, 0, 0, scm_isatty_p);
SCM port;
{
int rv;
- SCM_ASSERT (SCM_NIMP (port) && SCM_OPFPORTP (port), port, SCM_ARG1, s_isatty);
- rv = fileno ((FILE *)SCM_STREAM (port));
- if (rv == -1)
- scm_syserror (s_isatty);
- rv = isatty (rv);
+
+ port = SCM_COERCE_OUTPORT (port);
+
+ if (!(SCM_NIMP (port) && SCM_OPFPORTP (port)))
+ return SCM_BOOL_F;
+
+ rv = isatty (SCM_FPORT_FDES (port));
return rv ? SCM_BOOL_T : SCM_BOOL_F;
}
SCM fdes;
SCM modes;
{
- FILE *f;
SCM port;
- struct scm_port_table * pt;
SCM_ASSERT (SCM_INUMP (fdes), fdes, SCM_ARG1, s_fdopen);
SCM_ASSERT (SCM_NIMP (modes) && SCM_ROSTRINGP (modes), modes, SCM_ARG2,
s_fdopen);
SCM_COERCE_SUBSTR (modes);
- SCM_NEWCELL (port);
- SCM_DEFER_INTS;
- f = fdopen (SCM_INUM (fdes), SCM_ROCHARS (modes));
- if (f == NULL)
- scm_syserror (s_fdopen);
- pt = scm_add_to_port_table (port);
- SCM_SETPTAB_ENTRY (port, pt);
- SCM_SETCAR (port, scm_tc16_fport | scm_mode_bits (SCM_ROCHARS (modes)));
- SCM_SETSTREAM (port, (SCM)f);
- if (SCM_BUF0 & SCM_CAR (port))
- scm_setbuf0 (port);
- SCM_ALLOW_INTS;
+ port = scm_fdes_to_port (SCM_INUM (fdes), SCM_ROCHARS (modes), SCM_BOOL_F);
return port;
}
SCM port;
SCM fd;
{
- FILE *stream;
+ struct scm_fport *stream;
int old_fd;
int new_fd;
int rv;
+ port = SCM_COERCE_OUTPORT (port);
+
SCM_ASSERT (SCM_NIMP (port) && SCM_OPFPORTP (port), port, SCM_ARG1, s_primitive_move_to_fdes);
SCM_ASSERT (SCM_INUMP (fd), fd, SCM_ARG2, s_primitive_move_to_fdes);
- SCM_DEFER_INTS;
- stream = (FILE *)SCM_STREAM (port);
- old_fd = fileno (stream);
+ stream = SCM_FSTREAM (port);
+ old_fd = stream->fdes;
new_fd = SCM_INUM (fd);
if (old_fd == new_fd)
{
- SCM_ALLOW_INTS;
return SCM_BOOL_F;
}
scm_evict_ports (new_fd);
rv = dup2 (old_fd, new_fd);
if (rv == -1)
scm_syserror (s_primitive_move_to_fdes);
- scm_setfileno (stream, new_fd);
+ stream->fdes = new_fd;
SCM_SYSCALL (close (old_fd));
- SCM_ALLOW_INTS;
return SCM_BOOL_T;
}
-#ifdef FD_SETTER
-#define SET_FILE_FD_FIELD(F,D) ((F)->FD_SETTER = (D))
-#endif
-
-void
-scm_setfileno (fs, fd)
- FILE *fs;
- int fd;
-{
-#ifdef SET_FILE_FD_FIELD
- SET_FILE_FD_FIELD(fs, fd);
-#else
- scm_misc_error ("scm_setfileno", "Not fully implemented on this platform",
- SCM_EOL);
-#endif
-}
-
/* Return a list of ports using a given file descriptor. */
SCM_PROC(s_fdes_to_ports, "fdes->ports", 1, 0, 0, scm_fdes_to_ports);
SCM_ASSERT (SCM_INUMP (fd), fd, SCM_ARG1, s_fdes_to_ports);
int_fd = SCM_INUM (fd);
- SCM_DEFER_INTS;
for (i = 0; i < scm_port_table_size; i++)
{
- if (SCM_FPORTP (scm_port_table[i]->port)
- && fileno ((FILE *)SCM_STREAM (scm_port_table[i]->port)) == int_fd)
+ if (SCM_OPFPORTP (scm_port_table[i]->port)
+ && ((struct scm_fport *) scm_port_table[i]->stream)->fdes == int_fd)
result = scm_cons (scm_port_table[i]->port, result);
}
- SCM_ALLOW_INTS;
return result;
}
void
scm_init_ioext ()
{
- /* fseek() symbols. */
- scm_sysintern ("SEEK_SET", SCM_MAKINUM (SEEK_SET));
- scm_sysintern ("SEEK_CUR", SCM_MAKINUM (SEEK_CUR));
- scm_sysintern ("SEEK_END", SCM_MAKINUM (SEEK_END));
-
#include "ioext.x"
}
HCoop / bpt / guile.git / blobdiff