github.com/Interlisp.maiko
1
0
Fork 0
mirror of https://github.com/Interlisp/maiko.git synced 2026-01-14 07:30:21 +00:00
Code Issues Projects Releases Wiki Activity

Fix compilation with MAIKO_HANDLE_CONSOLE_MESSAGES. (#332)

Browse Source 
* Switch from sgtty over to termios. All of the various
  separate values that were copied individually before
  can now be done at once.
* Fix compilation error with missing `&`.
* Fix compilation error with missing return value.

I haven't tested that this works as I don't know how to do that,
but at least it compiles now.
This commit is contained in:
Bruce Mitchener 2021-02-01 13:42:39 +07:00 committed by GitHub
parent 275c5b9c13
commit f0a53302ce
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/osmsg.c
View File

@ -31,6 +31,7 @@
#include <sys/statvfs.h>
#include <sys/time.h>
#include <sys/types.h>
#include <termios.h>
#include <unistd.h>
@ -85,8 +86,7 @@ void mess_init() {
int ttyfd;
int ptyfd, ptynum;
char *ptyname, *ttyname;
int temp;
int on = 1;
struct termios options;
ptyname = "/dev/ptypx";
ttyname = "/dev/ttypx";
@ -110,21 +110,8 @@ gotpty:
}
/* Set tty parameters same as stderr */
ioctl(2, TIOCGETD, &temp); /* Line discipline */
ioctl(ttyfd, TIOCSETD, &temp);
ioctl(2, TIOCGETP, &temp); /* TTY parameters */
ioctl(ttyfd, TIOCSETP, &temp);
ioctl(2, TIOCLGET, &temp);
ioctl(ttyfd, TIOCLSET, &temp);
ioctl(2, TIOCGETC, &temp); /* Terminal characters */
ioctl(ttyfd, TIOCSETC, &temp);
ioctl(2, TIOCGLTC, &temp); /* Local special characters */
ioctl(ttyfd, TIOCSLTC, &temp);
tcgetattr(2, &options);
tcsetattr(ttyfd, TCSANOW, &options);
/* Get console IO */
ioctl(ptyfd, FIOCLEX, 0);
@ -334,7 +321,7 @@ LispPTR flush_pty() {
FD_SET(cons_pty, &rfds);
if (select(32, &rfds, NULL, NULL, &selecttimeout) <= 0) return (NIL);
if ((cons_pty >= 0) && FD_ISSET(cons_pty, rfds))
if ((cons_pty >= 0) && FD_ISSET(cons_pty, &rfds))
#else /* LOGINT */
if ((cons_pty >= 0) && ((size = read(cons_pty, buf, MESSAGE_BUFFER_SIZE - 1)) > 0))
@ -379,6 +366,7 @@ LispPTR flush_pty() {
return (ATOM_T);
}
}
return (NIL);
#else
return (NIL);
#endif /* MAIKO_HANDLE_CONSOLE_MESSAGES */