summaryrefslogtreecommitdiff
path: root/libguile/ioext.c
diff options
context:
space:
mode:
authorGary Houston <ghouston@arglist.com>2001-01-24 21:45:09 +0000
committerGary Houston <ghouston@arglist.com>2001-01-24 21:45:09 +0000
commit6d36532c1c49cdb353c63275625c8343484107e9 (patch)
tree4ae00270b37f1686ef4786dcb030af94d0150a52 /libguile/ioext.c
parent1c8cbd62c5d9e8358cb5e5e4ce22f555a0995231 (diff)
downloadguile-6d36532c1c49cdb353c63275625c8343484107e9.tar.gz
* boot-9.scm: don't import (ice-9 rdelim) here. it's done
in C for now. * rdelim.scm: export the C primitives too. * documentation.scm: use (ice-9 rdelim). * filesys.c (scm_link): docstring fix. * fports.h (scm_setfileno): obsolete declaration removed. * posix.c: bogus popen declaration removed. * rdelim.c: new file, split from ioext.c with new proc scm_init_rdelim. * rdelim.h: new file. * Makefile.am: add rdelim.c and related files. * init.c: call scm_init_rdelim. include rdelim.h.
Diffstat (limited to 'libguile/ioext.c')
-rw-r--r--libguile/ioext.c233
1 files changed, 3 insertions, 230 deletions
diff --git a/libguile/ioext.c b/libguile/ioext.c
index 894982394..c3d976964 100644
--- a/libguile/ioext.c
+++ b/libguile/ioext.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
+/* Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001 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
@@ -44,20 +44,14 @@
-
-#include <stdio.h>
#include "libguile/_scm.h"
-#include "libguile/ports.h"
-#include "libguile/read.h"
+#include "libguile/ioext.h"
#include "libguile/fports.h"
-#include "libguile/unif.h"
-#include "libguile/chars.h"
#include "libguile/feature.h"
+#include "libguile/ports.h"
#include "libguile/root.h"
#include "libguile/strings.h"
-
#include "libguile/validate.h"
-#include "libguile/ioext.h"
#include <fcntl.h>
@@ -168,227 +162,6 @@ SCM_DEFINE (scm_read_string_x_partial, "read-string!/partial", 1, 3, 0,
}
#undef FUNC_NAME
-SCM_DEFINE (scm_read_delimited_x, "%read-delimited!", 3, 3, 0,
- (SCM delims, SCM str, SCM gobble, SCM port, SCM start, SCM end),
- "Read characters from @var{port} into @var{str} until one of the\n"
- "characters in the @var{delims} string is encountered. If @var{gobble}\n"
- "is true, discard the delimiter character; otherwise, leave it\n"
- "in the input stream for the next read.\n"
- "If @var{port} is not specified, use the value of\n"
- "@code{(current-input-port)}. If @var{start} or @var{end} are specified,\n"
- "store data only into the substring of @var{str} bounded by @var{start}\n"
- "and @var{end} (which default to the beginning and end of the string,\n"
- "respectively).\n\n"
- "Return a pair consisting of the delimiter that terminated the string and\n"
- "the number of characters read. If reading stopped at the end of file,\n"
- "the delimiter returned is the @var{eof-object}; if the string was filled\n"
- "without encountering a delimiter, this value is @var{#f}.")
-#define FUNC_NAME s_scm_read_delimited_x
-{
- long j;
- char *buf;
- long cstart;
- long cend;
- int c;
- char *cdelims;
- int num_delims;
-
- SCM_VALIDATE_STRING_COPY (1, delims, cdelims);
- num_delims = SCM_STRING_LENGTH (delims);
- SCM_VALIDATE_SUBSTRING_SPEC_COPY (2, str, buf, 5, start, cstart,
- 6, end, cend);
- if (SCM_UNBNDP (port))
- port = scm_cur_inp;
- else
- SCM_VALIDATE_OPINPORT (4,port);
-
- for (j = cstart; j < cend; j++)
- {
- int k;
-
- c = scm_getc (port);
- for (k = 0; k < num_delims; k++)
- {
- if (cdelims[k] == c)
- {
- if (SCM_FALSEP (gobble))
- scm_ungetc (c, port);
-
- return scm_cons (SCM_MAKE_CHAR (c),
- scm_long2num (j - cstart));
- }
- }
- if (c == EOF)
- return scm_cons (SCM_EOF_VAL,
- scm_long2num (j - cstart));
-
- buf[j] = c;
- }
- return scm_cons (SCM_BOOL_F, scm_long2num (j - cstart));
-}
-#undef FUNC_NAME
-
-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_DEFINE (scm_read_line, "%read-line", 0, 1, 0,
- (SCM port),
- "Read a newline-terminated line from @var{port}, allocating storage as\n"
- "necessary. The newline terminator (if any) is removed from the string,\n"
- "and a pair consisting of the line and its delimiter is returned. The\n"
- "delimiter may be either a newline or the @var{eof-object}; if\n"
- "@code{%read-line} is called at the end of file, it returns the pair\n"
- "@code{(#<eof> . #<eof>)}.")
-#define FUNC_NAME s_scm_read_line
-{
- scm_port *pt;
- char *s;
- int slen;
- SCM line, term;
-
- if (SCM_UNBNDP (port))
- port = scm_cur_inp;
- SCM_VALIDATE_OPINPORT (1,port);
-
- pt = SCM_PTAB_ENTRY (port);
- if (pt->rw_active == SCM_PORT_WRITE)
- scm_ptobs[SCM_PTOBNUM (port)].flush (port);
-
- s = (char *) scm_do_read_line (port, &slen);
-
- if (s == NULL)
- term = line = SCM_EOF_VAL;
- else
- {
- if (s[slen-1] == '\n')
- {
- term = SCM_MAKE_CHAR ('\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);
-}
-#undef FUNC_NAME
-
-SCM_DEFINE (scm_write_line, "write-line", 1, 1, 0,
- (SCM obj, SCM port),
- "Display @var{obj} and a newline character to @var{port}. If @var{port}\n"
- "is not specified, @code{(current-output-port)} is used. This function\n"
- "is equivalent to:\n\n"
- "@smalllisp\n"
- "(display obj [port])\n"
- "(newline [port])\n"
- "@end smalllisp")
-#define FUNC_NAME s_scm_write_line
-{
- scm_display (obj, port);
- return scm_newline (port);
-}
-#undef FUNC_NAME
-
SCM_DEFINE (scm_ftell, "ftell", 1, 0, 0,
(SCM object),
"Returns an integer representing the current position of @var{fd/port},\n"