mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-06-24 12:20:20 +02:00
Code Activity

Avoid throwing exceptions during early boot if stdin is closed

Browse source 
* libguile/fports.c (scm_i_fdes_is_valid): New internal helper.
  (scm_i_fdes_to_port): Use new helper.
* libguile/fports.h: Declare new helper.
* libguile/init.c (scm_standard_stream_to_port): Refactor to use
  scm_i_fdes_is_valid.
This commit is contained in:
Andy Wingo 2019-12-13 13:52:58 +01:00
parent cf693d862d
commit dbc93d6195
3 changed files with 37 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

44
libguile/fports.c
View file

@ -401,6 +401,29 @@ SCM_DEFINE (scm_i_open_file, "open-file", 2, 0, 1,
/* Building Guile ports from a file descriptor. */
int
scm_i_fdes_is_valid (int fdes, long mode_bits)
{
#ifdef F_GETFL
int flags = fcntl (fdes, F_GETFL, 0);
if (flags == -1)
return 0;
flags &= O_ACCMODE;
if (flags == O_RDWR)
return 1;
if (flags != O_WRONLY && (mode_bits & SCM_WRTNG))
return 0;
if (flags != O_RDONLY && (mode_bits & SCM_RDNG))
return 0;
return 1;
#else
/* If we don't have F_GETFL, as on mingw, at least we can test that
it is a valid file descriptor. */
struct stat st;
return fstat (fdes, &st) == 0;
#endif
}
/* 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.
@ -415,27 +438,14 @@ scm_i_fdes_to_port (int fdes, long mode_bits, SCM name, unsigned options)
if (options & SCM_FPORT_OPTION_VERIFY)
{
/* Check that the foreign FD is valid and matches the mode
bits. */
#ifdef F_GETFL
int 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))))
errno = 0;
if (!scm_i_fdes_is_valid (fdes, mode_bits))
{
if (errno)
SCM_SYSERROR;
SCM_MISC_ERROR ("requested file mode not available on fdes",
SCM_EOL);
}
#else
/* If we don't have F_GETFL, as on mingw, at least we can test that
it is a valid file descriptor. */
struct stat st;
if (fstat (fdes, &st) != 0)
SCM_SYSERROR;
#endif
}
fp = (scm_t_fport *) scm_gc_malloc_pointerless (sizeof (scm_t_fport),