folkert/simh-testsetgenerator
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SCP: Change use of O_NDELAY to O_NONBLOCK for Posix compatibility

Browse source
This commit is contained in:
Mark Pizzolato 2018-09-02 20:07:53 -07:00
parent 7f9e60de58
commit 6f2538380a
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
sim_console.c
View file

@ -3818,6 +3818,14 @@ return SCPE_OK;
#include <fcntl.h> #include <fcntl.h>
#include <unistd.h> #include <unistd.h>
#if (!defined(O_NONBLOCK)) && defined(O_NDELAY)
#define O_NONBLOCK O_NDELAY
#else
#if !defined(O_NONBLOCK)
#define O_NONBLOCK FNDELAY
#endif
#endif
struct sgttyb cmdtty,runtty; /* V6/V7 stty data */ struct sgttyb cmdtty,runtty; /* V6/V7 stty data */
struct tchars cmdtchars,runtchars; /* V7 editing */ struct tchars cmdtchars,runtchars; /* V7 editing */
struct ltchars cmdltchars,runltchars; /* 4.2 BSD editing */ struct ltchars cmdltchars,runltchars; /* 4.2 BSD editing */
@ -3828,7 +3836,7 @@ static t_stat sim_os_ttinit (void)
sim_debug (DBG_TRC, &sim_con_telnet, "sim_os_ttinit() - BSDTTY\n"); sim_debug (DBG_TRC, &sim_con_telnet, "sim_os_ttinit() - BSDTTY\n");
cmdfl = fcntl (fileno (stdin), F_GETFL, 0); /* get old flags and status */ cmdfl = fcntl (fileno (stdin), F_GETFL, 0); /* get old flags and status */
runfl = cmdfl | FNDELAY; runfl = cmdfl | O_NONBLOCK;
if (ioctl (0, TIOCGETP, &cmdtty) < 0) if (ioctl (0, TIOCGETP, &cmdtty) < 0)
return SCPE_TTIERR; return SCPE_TTIERR;
if (ioctl (0, TIOCGETC, &cmdtchars) < 0) if (ioctl (0, TIOCGETC, &cmdtchars) < 0)
@ -3963,7 +3971,7 @@ runfl = cmdfl;
* this is turned on and off depending on whether simulation * this is turned on and off depending on whether simulation
* is running or not. * is running or not.
*/ */
runfl = cmdfl | O_NDELAY; runfl = cmdfl | O_NONBLOCK;
if (!isatty (fileno (stdin))) /* skip if !tty */ if (!isatty (fileno (stdin))) /* skip if !tty */
return SCPE_OK; return SCPE_OK;
if (tcgetattr (0, &cmdtty) < 0) /* get old flags */ if (tcgetattr (0, &cmdtty) < 0) /* get old flags */