mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-06-15 08:10:17 +02:00
Code Activity

* ports.c (flush_void_port): renamed to flush_port_default.

Browse source 
(end_input_void_port): renamed to end_input_default.

	* init.c (scm_standard_stream_to_port): create a void port instead
	of opening /dev/null if the standard file descriptors are bad.
	advantages: no portability problems, doesn't waste a file descriptor,
	simplifies the code (thanks to Marius for the idea).

	* vports.c (s_scm_make_soft_port): call scm_port_non_buffer.

	* void ports: make reading from a void port give EOF instead of
	segv:
	* ports.c (s_scm_sys_make_void_port): modified docstring.
	(fill_input_void_port): new proc.
	(scm_init_ports): set up fill_input_void_port.
	* ports.c (scm_port_non_buffer): new proc.
	(scm_void_port): call scm_port_non_buffer.

	* fports.c (scm_setvbuf): docstring: remove the fcntl documentation
	which was incorrectly appended.
This commit is contained in:
Gary Houston 2000-03-13 22:21:21 +00:00
parent 26fba92291
commit 70df8af662
5 changed files with 33 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

22
libguile/init.c
View file

@ -279,8 +279,8 @@ stream_handler (void *data, SCM tag, SCM throw_args)
- set the revealed count for FILE's file descriptor to 1, so
that fdes won't be closed when the port object is GC'd.
- catch exceptions: allow Guile to be able to start up even
if it has been handed bogus stdin/stdout/stderr. In this case
try to open a new stream on /dev/null. */
if it has been handed bogus stdin/stdout/stderr. replace the
bad ports with void ports. */
static SCM
scm_standard_stream_to_port (int fdes, char *mode, char *name)
{
@ -293,23 +293,7 @@ scm_standard_stream_to_port (int fdes, char *mode, char *name)
port = scm_internal_catch (SCM_BOOL_T, stream_body, &body_data,
stream_handler, NULL);
if (SCM_FALSEP (port))
{
/* FIXME: /dev/null portability. there's also *null-device* in
r4rs.scm. */
int null_fdes = open ("/dev/null",
(mode[0] == 'r') ? O_RDONLY : O_WRONLY);
body_data.fdes = null_fdes;
port = (null_fdes == -1) ? SCM_BOOL_F
: scm_internal_catch (SCM_BOOL_T, stream_body, &body_data,
stream_handler, NULL);
/* if the standard fdes was not allocated, reset the revealed count
on the grounds that the user doesn't know what it is. */
if (SCM_NFALSEP (port) && null_fdes != fdes)
SCM_REVEALED (port) = 0;
/* if port is still #f, we'll just leave it like that and
an error will be raised on the first attempt to use it. */
}
port = scm_void_port (mode);
return port;
}