Apple-2gs-SW
/
marlene
mirror of https://github.com/ksherlock/marlene.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fixes.

This commit is contained in:
Kelvin Sherlock 2018-05-11 09:15:56 -04:00
parent d2e0554bc8
commit c46aadf52d
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
darlene.c
View File

@ -122,19 +122,21 @@ forkpty2(int *amaster, char *name, struct sgttyb *sg, struct winsize *winp) {
ok = openpty2(&master, &slave, name, sg, winp); ok = openpty2(&master, &slave, name, sg, winp);
if (ok < 0) return -1; if (ok < 0) return -1;
pid = fork2(_child, 256, 0, NULL, 4, master, slave); pid = fork2(_child, 512, 0, "darlene child", 2, master, slave);
if (pid < 0) { if (pid < 0) {
close(master); close(master);
close(slave); close(slave);
return -1; return -1;
} }
*amaster = master;
close(slave); close(slave);
return pid; return pid;
} }
#pragma databank 1 #pragma databank 1
static void sigchild(int sig, int x) { static void sigchild(int sig, int x) {
PostEvent(app4Mask,0); //display_cstr("\r\nsigchild\r\n");
PostEvent(app4Evt,0);
} }
#pragma databank 0 #pragma databank 0
@ -217,7 +219,8 @@ int main(int argc, char **argv) {
for(;;) { for(;;) {
static char buffer[1024]; static char buffer[1024];
int fio = 0; int fio = 0;
ioctl(master, FIONREAD, &fio); int ok;
ok = ioctl(master, FIONREAD, &fio);
if (fio > sizeof(buffer)) fio = sizeof(buffer); if (fio > sizeof(buffer)) fio = sizeof(buffer);
if (fio > 0) { if (fio > 0) {
fio = read(master, buffer, fio); fio = read(master, buffer, fio);
@ -260,10 +263,9 @@ int main(int argc, char **argv) {
} }
} }
if (event.what == app4Mask) { if (event.what == app4Evt) {
/* child signal received! */ /* child signal received! */
union wait wt; union wait wt;
int ok;
ok = waitpid(pid, &wt, WNOHANG); ok = waitpid(pid, &wt, WNOHANG);
if (ok <= 0) continue; if (ok <= 0) continue;
display_cstr("\r\nChild exited.\r\n"); display_cstr("\r\nChild exited.\r\n");