cvs/repos/extra-x86_64/cvs-1.11.19-abortabort.patch

   1 --- cvs-1.11.19/src/server.c.old3       2004-09-24 21:59:08.000000000 +0200
   2 +++ cvs-1.11.19/src/server.c    2005-02-28 13:09:22.000000000 +0100
   3 @@ -4900,6 +4900,15 @@
   4      int status;
   5      int save_noexec;
   6
   7 +#ifndef DONT_USE_SIGNALS
   8 +#ifdef SIGABRT
   9 +    /* Need to deregister the SIGABRT handler so that if an assertion
  10 +       fails and calls abort while we're cleaning up, we won't
  11 +       infinitely recurse in the cleanup function. */
  12 +    SIG_deregister(SIGABRT, server_cleanup);
  13 +#endif
  14 +#endif /* !DONT_USE_SIGNALS */
  15 +
  16      if (buf_to_net != NULL)
  17      {
  18         /* Since we're done, go ahead and put BUF_TO_NET back into blocking
  19 --- cvs-1.11.19/src/main.c.old3 2005-02-03 15:50:51.000000000 +0100
  20 +++ cvs-1.11.19/src/main.c      2005-02-28 13:02:52.000000000 +0100
  21 @@ -341,6 +341,13 @@
  22      const char *name;
  23      char temp[10];
  24
  25 +#ifdef SIGABRT
  26 +    /* Need to deregister the SIGABRT handler so that if an assertion
  27 +       fails and calls abort while we're cleaning up, we won't
  28 +       infinitely recurse in the cleanup function. */
  29 +    SIG_deregister(SIGABRT, main_cleanup);
  30 +#endif
  31 +
  32      switch (sig)
  33      {
  34  #ifdef SIGABRT
  35 --- cvs-1.11.19/src/rcs.c.old3  2005-01-31 23:15:08.000000000 +0100
  36 +++ cvs-1.11.19/src/rcs.c       2005-02-28 13:06:06.000000000 +0100
  37 @@ -8314,6 +8314,15 @@
  38         called from a signal handler, so we don't know whether the
  39         files got created.  */
  40
  41 +#ifndef DONT_USE_SIGNALS
  42 +#ifdef SIGABRT
  43 +    /* Need to deregister the SIGABRT handler so that if an assertion
  44 +       fails and calls abort while we're cleaning up, we won't
  45 +       infinitely recurse in the cleanup function. */
  46 +    SIG_deregister(SIGABRT, rcs_cleanup);
  47 +#endif
  48 +#endif /* !DONT_USE_SIGNALS */
  49 +
  50      /* FIXME: Do not perform buffered I/O from an interrupt handler like
  51         this (via error).  However, I'm leaving the error-calling code there
  52         in the hope that on the rare occasion the error call is actually made
  53 --- cvs-1.11.19/src/patch.c.old3        2005-01-31 23:15:02.000000000 +0100
  54 +++ cvs-1.11.19/src/patch.c     2005-02-28 13:04:16.000000000 +0100
  55 @@ -796,6 +796,15 @@
  56         called from a signal handler, without SIG_begincrsect, so
  57         we don't know whether the files got created.  */
  58
  59 +#ifndef DONT_USE_SIGNALS
  60 +#ifdef SIGABRT
  61 +    /* Need to deregister the SIGABRT handler so that if an assertion
  62 +       fails and calls abort while we're cleaning up, we won't
  63 +       infinitely recurse in the cleanup function. */
  64 +    SIG_deregister(SIGABRT, patch_cleanup);
  65 +#endif
  66 +#endif /* !DONT_USE_SIGNALS */
  67 +
  68      if (tmpfile1 != NULL)
  69      {
  70         if (unlink_file (tmpfile1) < 0