add pathnames.h

[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 f4f2cbb..bb4afe6 100644 (file)
--- a/usr/src/usr.bin/window/wwchild.c
+++ b/usr/src/usr.bin/window/wwchild.c
@@ -1,30 +1,50 @@
+/*
+ * Copyright (c) 1983 Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that the above copyright notice and this paragraph are
+ * duplicated in all such forms and that any documentation,
+ * advertising materials, and other materials related to such
+ * distribution and use acknowledge that the software was developed
+ * by the University of California, Berkeley.  The name of the
+ * University may not be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ */
+

 #ifndef lint
 #ifndef lint

-static char *sccsid = "@(#)wwchild.c   1.4 83/07/19";
-#endif
+static char sccsid[] = "@(#)wwchild.c  3.9 (Berkeley) %G%";
+#endif /* not lint */

 
 #include "ww.h"
 
 #include "ww.h"

+#include <sys/types.h>

 #include <sys/wait.h>
 
 wwchild()
 {
 #include <sys/wait.h>
 
 wwchild()
 {

-       register struct ww *wp;
+       extern errno;
+       int olderrno;
+       register struct ww **wp;

        union wait w;
        int pid;
        union wait w;
        int pid;

+       char collected = 0;

 
 

-       while ((pid = wait3(&w, WNOHANG|WUNTRACED, 0)) > 0) {
-               for (wp = wwhead; wp; wp = wp->ww_next) {
-                       if (wp->ww_pid == pid) {
-                               wp->ww_state = WW_DEAD;
-                               /*
-                               wwprintf(curwin,
-                                       "\r\n%d: Died\r\n", pid);
-                               */
+       olderrno = errno;
+       while ((pid = wait3(&w, WNOHANG|WUNTRACED, (struct rusage *)0)) > 0) {
+               for (wp = wwindex; wp < &wwindex[NWW]; wp++) {
+                       if (*wp && (*wp)->ww_state == WWS_HASPROC
+                           && (*wp)->ww_pid == pid) {
+                               (*wp)->ww_state = WWS_DEAD;
+                               collected = 1;

                                break;
                        }
                }
                                break;
                        }
                }

-               /*
-               if (wp == 0)
-                       wwprintf(curwin, "\r\n%d: No such child\r\n", pid);
-               */

        }
        }

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

 }
 }