github.com/Interlisp.maiko
1
0
Fork 0
mirror of https://github.com/Interlisp/maiko.git synced 2026-02-01 22:32:40 +00:00
Code Issues Projects Releases Wiki Activity

Update fcntl F_SETFL usage. (#144)

Browse Source 
This changes from `FASYNC` to `O_ASYNC`, `FNDELAY` to `O_NONBLOCK`,
and `O_NDELAY` to `O_NONBLOCK`. These are the modern names.

`O_NONBLOCK` is part of the POSIX standard. However, `O_ASYNC` is
specific to Linux and BSD. It is not available on Solaris, where
we still need to use `FASYNC`. Also, the behavior of having I/O
trigger a `SIGIO` signal is not in POSIX, since the `SIGIO` signal
is not in POSIX. Instead, it is only the behavior of having `SIGURG`
being signalled for out of band data that is specified.

We also takes this opportunity to collapse some multi-line calls
to get the flags, store it into a temp, and then set them, to
just doing it in one line, skipping the stored temporary value.

We also change one instance of `65535 - FNDELAY` to `~O_NONBLOCK`.

Closes interlisp/medley#85.
This commit is contained in:
Bruce Mitchener
2020-12-31 08:28:34 +07:00
committed by GitHub
parent 3b1bdd225f
commit 6adb79840d
16 changed files with 42 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/unixcomm.c
View File

@@ -309,7 +309,7 @@ int FindUnixPipes(void) {
/* Find the first PTY pair that is not in use */
int FindAvailablePty(char *Master, char *Slave) {
int res, flags;
int res;
char *let, *num;
#ifdef OS5
@@ -335,10 +335,7 @@ int FindAvailablePty(char *Master, char *Slave) {
#endif
if (res != -1) {
flags = fcntl(res, F_GETFL, 0);
flags |= FNDELAY;
fcntl(res, F_SETFL, flags);
fcntl(res, F_SETFL, fcntl(res, F_GETFL, 0) | O_NONBLOCK);
return (res);
}
#ifndef FULLSLAVENAME
@@ -403,7 +400,7 @@ LispPTR Unix_handlecomm(LispPTR *args) {
case 0: /* Fork pipe process */
{
char *UpPipeName, *DownPipeName, *PipeName;
int res, slot, PipeFD, sockFD;
int slot, PipeFD, sockFD;
/* First create the socket */
struct sockaddr_un sock;
@@ -450,9 +447,7 @@ LispPTR Unix_handlecomm(LispPTR *args) {
if (unlink(PipeName) < 0) perror("Unlink");
return (NIL);
}
res = fcntl(PipeFD, F_GETFL, 0);
res |= FNDELAY;
if (fcntl(PipeFD, F_SETFL, res) == -1) {
if (fcntl(PipeFD, F_SETFL, fcntl(PipeFD, F_GETFL, 0) | O_NONBLOCK) == -1) {
perror("setting up fifo to nodelay");
return (NIL);
}
@@ -614,7 +609,7 @@ LispPTR Unix_handlecomm(LispPTR *args) {
case 11: /* Fork PTY process */
{
char MasterFD[20], SlavePTY[32];
int Master, flags, slot;
int Master, slot;
unsigned short len;
Master = FindAvailablePty(MasterFD, SlavePTY);
@@ -650,9 +645,7 @@ LispPTR Unix_handlecomm(LispPTR *args) {
DBPRINT(("Pipe/fork result = %d.\n", d[3]));
if (d[3] == 1) {
/* Set up the IO not to block */
flags = fcntl(Master, F_GETFL, 0);
flags |= FNDELAY;
fcntl(Master, F_SETFL, flags);
fcntl(Master, F_SETFL, fcntl(Master, F_GETFL, 0) | O_NONBLOCK);
UJ[slot].type = UJSHELL; /* so we can find them */
UJ[slot].PID = (d[1] << 8) | d[2];
@@ -832,7 +825,7 @@ LispPTR Unix_handlecomm(LispPTR *args) {
case 12: /* create Unix socket */
{
int flags, sockFD;
int sockFD;
struct sockaddr_un sock;
/* First open the socket */
@@ -861,9 +854,7 @@ LispPTR Unix_handlecomm(LispPTR *args) {
DBPRINT(("Socket %d bound to name %s.\n", sockFD, shcom));
if (listen(sockFD, 1) < 0) perror("Listen");
/* Set up the IO not to block */
flags = fcntl(sockFD, F_GETFL, 0);
flags |= FNDELAY;
fcntl(sockFD, F_SETFL, flags);
fcntl(sockFD, F_SETFL, fcntl(sockFD, F_GETFL, 0) | O_NONBLOCK);
/* things seem sane, fill out the rest of the UJ slot and return */
UJ[sockFD].status = -1;