{
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));
}
+/*
+ * %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
+scm_read_line (port)
+ SCM port;
+{
+ 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);
+ }
+
+ 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);
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)));
+
+ object = SCM_COERCE_OUTPORT (object);
+
+ SCM_DEFER_INTS;
+ if (SCM_NIMP (object) && SCM_OPFPORTP (object))
+ {
+ SCM_SYSCALL (pos = ftell ((FILE *)SCM_STREAM (object)));
+ if (pos > 0 && SCM_CRDYP (object))
+ pos--;
+ }
+ else
+ {
+ SCM_ASSERT (SCM_INUMP (object), object, SCM_ARG1, s_ftell);
+ SCM_SYSCALL (pos = lseek (SCM_INUM (object), 0, SEEK_CUR));
+ }
if (pos < 0)
scm_syserror (s_ftell);
- if (pos > 0 && SCM_CRDYP (port))
- pos--;
+ SCM_ALLOW_INTS;
return scm_long2num (pos);
}
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_ASSERT (SCM_NIMP (port) && SCM_OPFPORTP (port), port, SCM_ARG1, s_fseek);
+ object = SCM_COERCE_OUTPORT (object);
+
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_ASSERT (SCM_INUMP (whence), whence, SCM_ARG3, s_fseek);
+ SCM_DEFER_INTS;
+ if (SCM_NIMP (object) && SCM_OPFPORTP (object))
+ {
+ SCM_CLRDY (object); /* Clear ungetted char */
+ rv = fseek ((FILE *)SCM_STREAM (object), loff, SCM_INUM (whence));
+ }
+ else
+ {
+ SCM_ASSERT (SCM_INUMP (object), object, SCM_ARG1, s_fseek);
+ rv = lseek (SCM_INUM (object), loff, SCM_INUM (whence));
+ }
+ if (rv < 0)
scm_syserror (s_fseek);
+ SCM_ALLOW_INTS;
return SCM_UNSPECIFIED;
}
-
-
SCM_PROC (s_freopen, "freopen", 3, 0, 0, scm_freopen);
SCM
SCM_COERCE_SUBSTR (filename);
SCM_COERCE_SUBSTR (modes);
+ port = SCM_COERCE_OUTPORT (port);
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),
return port;
}
-
-
-SCM_PROC (s_duplicate_port, "duplicate-port", 2, 0, 0, scm_duplicate_port);
-
-SCM
-scm_duplicate_port (oldpt, modes)
- SCM oldpt;
- SCM modes;
-{
- int oldfd;
- int newfd;
- FILE *f;
- SCM newpt;
- SCM_ASSERT (SCM_NIMP (oldpt) && SCM_OPPORTP (oldpt), oldpt, SCM_ARG1,
- s_duplicate_port);
- SCM_ASSERT (SCM_NIMP (modes) && SCM_ROSTRINGP (modes), modes, SCM_ARG2,
- s_duplicate_port);
-
- SCM_COERCE_SUBSTR (modes);
- SCM_NEWCELL (newpt);
- SCM_DEFER_INTS;
- oldfd = fileno ((FILE *)SCM_STREAM (oldpt));
- if (oldfd == -1)
- scm_syserror (s_duplicate_port);
- SCM_SYSCALL (newfd = dup (oldfd));
- if (newfd == -1)
- scm_syserror (s_duplicate_port);
- f = fdopen (newfd, SCM_ROCHARS (modes));
- if (!f)
- {
- SCM_SYSCALL (close (newfd));
- scm_syserror (s_duplicate_port);
- }
- {
- struct scm_port_table * pt;
- pt = scm_add_to_port_table (newpt);
- SCM_SETPTAB_ENTRY (newpt, pt);
- SCM_SETCAR (newpt, scm_tc16_fport | scm_mode_bits (SCM_ROCHARS (modes)));
- SCM_SETSTREAM (newpt, (SCM)f);
- if (SCM_BUF0 & SCM_CAR (newpt))
- scm_setbuf0 (newpt);
- SCM_PTAB_ENTRY (newpt)->file_name = SCM_PTAB_ENTRY (oldpt)->file_name;
- }
- SCM_ALLOW_INTS;
- return newpt;
-}
-
-
-
SCM_PROC (s_redirect_port, "redirect-port", 2, 0, 0, scm_redirect_port);
SCM
{
int ans, oldfd, newfd;
+ old = SCM_COERCE_OUTPORT (old);
+ new = SCM_COERCE_OUTPORT (new);
+
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);
return SCM_UNSPECIFIED;
}
+SCM_PROC (s_dup_to_fdes, "dup->fdes", 1, 1, 0, scm_dup_to_fdes);
+SCM
+scm_dup_to_fdes (SCM fd_or_port, SCM fd)
+{
+ int oldfd, newfd, rv;
+
+ fd_or_port = SCM_COERCE_OUTPORT (fd_or_port);
+
+ SCM_DEFER_INTS;
+ 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_dup_to_fdes);
+ oldfd = fileno ((FILE *)SCM_STREAM (fd_or_port));
+ if (oldfd == -1)
+ scm_syserror (s_dup_to_fdes);
+ }
+
+ if (SCM_UNBNDP (fd))
+ {
+ SCM_SYSCALL (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. */
+ SCM_SYSCALL (rv = dup2 (oldfd, newfd));
+ if (rv == -1)
+ scm_syserror (s_dup_to_fdes);
+ }
+ }
+ SCM_ALLOW_INTS;
+ return fd;
+}
+
SCM_PROC (s_fileno, "fileno", 1, 0, 0, scm_fileno);
SCM
SCM port;
{
int fd;
+
+ port = SCM_COERCE_OUTPORT (port);
+
SCM_ASSERT (SCM_NIMP (port) && SCM_OPFPORTP (port), port, SCM_ARG1, s_fileno);
fd = fileno ((FILE *)SCM_STREAM (port));
if (fd == -1)
SCM port;
{
int rv;
+
+ port = SCM_COERCE_OUTPORT (port);
+
SCM_ASSERT (SCM_NIMP (port) && SCM_OPFPORTP (port), port, SCM_ARG1, s_isatty);
rv = fileno ((FILE *)SCM_STREAM (port));
if (rv == -1)
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_SETSTREAM (port, (SCM)f);
SCM_ALLOW_INTS;
return port;
}
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;
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);
HCoop / bpt / guile.git / blobdiff