[Cvs-cvs] ccvs/src ChangeLog run.c

[Derek Robert Price]

CVSROOT:        /cvsroot/cvs
Module name:    ccvs
Changes by:     Derek Robert Price <dprice>     08/09/16 14:56:19

Modified files:
        src            : ChangeLog run.c 

Log message:
        * run.c: Assume POSIX signal handling, via GNULIB.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/ChangeLog?cvsroot=cvs&r1=1.3582&r2=1.3583
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/run.c?cvsroot=cvs&r1=1.64&r2=1.65

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/ChangeLog,v
retrieving revision 1.3582
retrieving revision 1.3583
diff -u -b -r1.3582 -r1.3583
--- ChangeLog   15 Sep 2008 21:48:55 -0000      1.3582
+++ ChangeLog   16 Sep 2008 14:56:18 -0000      1.3583
@@ -1,3 +1,7 @@
+2008-09-16  Derek R. Price  <address@hidden>
+
+       * run.c: Assume POSIX signal handling, via GNULIB.
+
 2008-09-15  Derek R. Price  <address@hidden>
 
        Compensate for GNULIB update.

Index: run.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/run.c,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -b -r1.64 -r1.65
--- run.c       12 Sep 2007 17:27:24 -0000      1.64
+++ run.c       16 Sep 2008 14:56:18 -0000      1.65
@@ -19,10 +19,13 @@
 /* Verify interface.  */
 #include "run.h"
 
-/* GNULIB headers.  */
+/* Standards */
+#include <signal.h>
+
+/* GNULIB */
 #include "wait.h"
 
-/* CVS headers.  */
+/* CVS */
 #include "cvs.h"
 
 
@@ -158,20 +161,9 @@
     int rerrno = 0;
     int pid, w;
 
-#ifdef POSIX_SIGNALS
     sigset_t sigset_mask, sigset_omask;
     struct sigaction act, iact, qact;
 
-#else
-#ifdef BSD_SIGNALS
-    int mask;
-    struct sigvec vec, ivec, qvec;
-
-#else
-    RETSIGTYPE (*istat) (), (*qstat) ();
-#endif
-#endif
-
     if (trace)
     {
        cvs_outerr (
@@ -286,7 +278,6 @@
     }
 
     /* the parent.  Ignore some signals for now */
-#ifdef POSIX_SIGNALS
     if (flags & RUN_SIGIGNORE)
     {
        act.sa_handler = SIG_IGN;
@@ -302,34 +293,10 @@
        (void) sigaddset (&sigset_mask, SIGQUIT);
        (void) sigprocmask (SIG_SETMASK, &sigset_mask, &sigset_omask);
     }
-#else
-#ifdef BSD_SIGNALS
-    if (flags & RUN_SIGIGNORE)
-    {
-       memset (&vec, 0, sizeof vec);
-       vec.sv_handler = SIG_IGN;
-       (void) sigvec (SIGINT, &vec, &ivec);
-       (void) sigvec (SIGQUIT, &vec, &qvec);
-    }
-    else
-       mask = sigblock (sigmask (SIGINT) | sigmask (SIGQUIT));
-#else
-    istat = signal (SIGINT, SIG_IGN);
-    qstat = signal (SIGQUIT, SIG_IGN);
-#endif
-#endif
 
     /* wait for our process to die and munge return status */
-#ifdef POSIX_SIGNALS
     while ((w = waitpid (pid, &status, 0)) == -1 && errno == EINTR)
        ;
-#else
-    while ((w = wait (&status)) != pid)
-    {
-       if (w == -1 && errno != EINTR)
-           break;
-    }
-#endif
 
     if (w == -1)
     {
@@ -352,7 +319,6 @@
 #endif /* VMS */
 
     /* restore the signals */
-#ifdef POSIX_SIGNALS
     if (flags & RUN_SIGIGNORE)
     {
        (void) sigaction (SIGINT, &iact, NULL);
@@ -360,20 +326,6 @@
     }
     else
        (void) sigprocmask (SIG_SETMASK, &sigset_omask, NULL);
-#else
-#ifdef BSD_SIGNALS
-    if (flags & RUN_SIGIGNORE)
-    {
-       (void) sigvec (SIGINT, &ivec, NULL);
-       (void) sigvec (SIGQUIT, &qvec, NULL);
-    }
-    else
-       (void) sigsetmask (mask);
-#else
-    (void) signal (SIGINT, istat);
-    (void) signal (SIGQUIT, qstat);
-#endif
-#endif
 
     /* cleanup the open file descriptors */
   out: