mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-05-20 11:40:18 +02:00
Code Activity

* ports.c: #include "filesys.h"

Browse source 
(scm_char_ready_p): input_waiting renamed and moved to filesys.c.
This commit is contained in:
Mikael Djurfeldt 1996-10-30 23:35:06 +00:00
parent 3feedb0011
commit 5d09ff4ea7
1 changed files with 4 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

65
libguile/ports.c
View file

@ -45,6 +45,7 @@
#include "chars.h"
#include "markers.h"
#include "filesys.h"
#include "fports.h"
#include "strports.h"
#include "vports.h"
@ -134,66 +135,6 @@ scm_fflush (port)
#ifdef __IBMC__
# define MSDOS
#endif
#ifdef MSDOS
# ifndef GO32
# include <io.h>
# include <conio.h>
static int input_waiting SCM_P ((FILE *f));
static int
input_waiting (f)
FILE *f;
{
if (feof (f))
return 1;
if (fileno (f) == fileno (stdin) && (isatty (fileno (stdin))))
return kbhit ();
return -1;
}
# endif
#else
# ifdef _DCC
# include <ioctl.h>
# else
# ifndef AMIGA
# ifndef vms
# ifdef MWC
# include <sys/io.h>
# else
# ifndef THINK_C
# ifndef ARM_ULIB
# include <sys/ioctl.h>
# endif
# endif
# endif
# endif
# endif
# endif
static int input_waiting SCM_P ((FILE *f));
static int
input_waiting(f)
FILE *f;
{
# ifdef FIONREAD
long remir;
if (feof(f)) return 1;
ioctl(fileno(f), FIONREAD, &remir);
return remir;
# else
return -1;
# endif
}
#endif
SCM_PROC(s_char_ready_p, "char-ready?", 1, 0, 0, scm_char_ready_p);
SCM
@ -206,7 +147,9 @@ scm_char_ready_p (port)
SCM_ASSERT (SCM_NIMP (port) && SCM_OPINPORTP (port), port, SCM_ARG1, s_char_ready_p);
if (SCM_CRDYP (port) || !SCM_FPORTP (port))
return SCM_BOOL_T;
return input_waiting ((FILE *)SCM_STREAM (port)) ? SCM_BOOL_T : SCM_BOOL_F;
return (scm_input_waiting_p ((FILE *) SCM_STREAM (port), s_char_ready_p)
? SCM_BOOL_T
: SCM_BOOL_F);
}