interrupt mechanism reworked, make SIGCHLD interrupt also

[unix-history] / usr / src / usr.bin / window / wwchild.c

diff --git a/usr/src/usr.bin/window/wwchild.c b/usr/src/usr.bin/window/wwchild.c
index d83c442..2971166 100644 (file)
--- a/usr/src/usr.bin/window/wwchild.c
+++ b/usr/src/usr.bin/window/wwchild.c
@@ -1,5 +1,5 @@
 #ifndef lint
 #ifndef lint

-static char sccsid[] = "@(#)wwchild.c  3.6 %G%";
+static char sccsid[] = "@(#)wwchild.c  3.7 %G%";

 #endif
 
 /*
 #endif
 
 /*


@@ -19,6 +19,7 @@ wwchild()
        register struct ww **wp;
        union wait w;
        int pid;
        register struct ww **wp;
        union wait w;
        int pid;

+       char collected = 0;

 
        olderrno = errno;
        while ((pid = wait3(&w, WNOHANG|WUNTRACED, (struct rusage *)0)) > 0) {
 
        olderrno = errno;
        while ((pid = wait3(&w, WNOHANG|WUNTRACED, (struct rusage *)0)) > 0) {


@@ -26,9 +27,13 @@ wwchild()
                        if (*wp && (*wp)->ww_state == WWS_HASPROC
                            && (*wp)->ww_pid == pid) {
                                (*wp)->ww_state = WWS_DEAD;
                        if (*wp && (*wp)->ww_state == WWS_HASPROC
                            && (*wp)->ww_pid == pid) {
                                (*wp)->ww_state = WWS_DEAD;

+                               collected = 1;

                                break;
                        }
                }
        }
        errno = olderrno;
                                break;
                        }
                }
        }
        errno = olderrno;

+       /* jump out of wwiomux when somebody dies */
+       if (collected)
+               wwsetintr();

 }
 }