X-Git-Url: https://git.distorted.org.uk/~mdw/xtoys/blobdiff_plain/566df6918473da40008c3871420ba9c44d454110..f227ff283ca1c6c6e39eec6790278ab714a918b2:/xcatch.c

diff --git a/xcatch.c b/xcatch.c
index 43d3b02..9a6c636 100644
--- a/xcatch.c
+++ b/xcatch.c
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: xcatch.c,v 1.4 1999/03/24 22:23:57 mdw Exp $
+ * $Id: xcatch.c,v 1.6 1999/05/19 20:41:15 mdw Exp $
  *
  * Catch input and trap it in an X window
  *
@@ -29,6 +29,12 @@
 /*----- Revision history --------------------------------------------------* 
  *
  * $Log: xcatch.c,v $
+ * Revision 1.6  1999/05/19 20:41:15  mdw
+ * Track gratuitous change in mdwopt interface.
+ *
+ * Revision 1.5  1999/05/05 18:55:18  mdw
+ * Block SIGCHLD around the `fork' call to prevent a race.
+ *
  * Revision 1.4  1999/03/24 22:23:57  mdw
  * Improve display for large files.  Keep newly added material in view if
  * scrolled to bottom of window.
@@ -264,8 +270,8 @@ int main(int argc, char *argv[])
       { "help",		0,		0,	'h' },
       { "usage",	0,		0,	'u' },
       { "version",	0,		0,	'v' },
-      { "file",		gFlag_argReq,	0,	'f' },
-      { "font",		gFlag_argReq,	0,	'F' },
+      { "file",		OPTF_ARGREQ,	0,	'f' },
+      { "font",		OPTF_ARGREQ,	0,	'F' },
       { 0,		0,		0,	0 }
     };
     int i = mdwopt(argc, argv, "huvf:F:", opt, 0, 0, 0);
@@ -327,6 +333,7 @@ int main(int argc, char *argv[])
     else {
       int pfd[2];
       struct sigaction sa;
+      sigset_t newmask, oldmask;
 
       /* --- Set up a signal handler --- */
 
@@ -339,6 +346,11 @@ int main(int argc, char *argv[])
 
       if (pipe(pfd))
 	die(1, "couldn't open pipe: %s", strerror(errno));
+
+      sigemptyset(&newmask);
+      sigaddset(&newmask, SIGCHLD);
+      sigprocmask(SIG_BLOCK, &newmask, &oldmask);
+
       kid = fork();
       if (kid < 0)
 	die(1, "couldn't fork: %s", strerror(errno));
@@ -360,6 +372,8 @@ int main(int argc, char *argv[])
 	write(STDERR_FILENO, d.buf, d.len);
 	_exit(127);
       }
+
+      sigprocmask(SIG_SETMASK, &oldmask, 0);
       fd = pfd[0];
       close(pfd[1]);
     }