Updating patches.

[rsync-patches.git] / catch_crash_signals.diff

diff --git a/catch_crash_signals.diff b/catch_crash_signals.diff
index 01a867b52e4940e4d89e24aceadf7623467ae9be..5b0cca9fe9944cbd60155cc7495a75ddb379f3b6 100644 (file)
--- a/catch_crash_signals.diff
+++ b/catch_crash_signals.diff
@@ -25,8 +25,8 @@ To use this patch, run these commands for a successful build:
     ./configure                                  (optional if already run)
     make
 
     ./configure                                  (optional if already run)
     make
 

+based-on: 2ac35b45071c7bfd8be6be41bfd45326f1f57bce

 diff --git a/errcode.h b/errcode.h
 diff --git a/errcode.h b/errcode.h

-index 41c5543..e9c5a28 100644

 --- a/errcode.h
 +++ b/errcode.h
 @@ -47,6 +47,8 @@
 --- a/errcode.h
 +++ b/errcode.h
 @@ -47,6 +47,8 @@


@@ -39,10 +39,9 @@ index 41c5543..e9c5a28 100644
   * ssh and the shell seem to return these values:
   *
 diff --git a/log.c b/log.c
   * ssh and the shell seem to return these values:
   *
 diff --git a/log.c b/log.c

-index a687375..8e46712 100644

 --- a/log.c
 +++ b/log.c
 --- a/log.c
 +++ b/log.c

-@@ -88,6 +88,7 @@ struct {
+@@ -91,6 +91,7 @@ struct {

        { RERR_TERMINATED , "sibling process terminated abnormally" },
        { RERR_SIGNAL1    , "received SIGUSR1" },
        { RERR_SIGNAL     , "received SIGINT, SIGTERM, or SIGHUP" },
        { RERR_TERMINATED , "sibling process terminated abnormally" },
        { RERR_SIGNAL1    , "received SIGUSR1" },
        { RERR_SIGNAL     , "received SIGINT, SIGTERM, or SIGHUP" },


@@ -51,10 +50,9 @@ index a687375..8e46712 100644
        { RERR_MALLOC     , "error allocating core memory buffers" },
        { RERR_PARTIAL    , "some files/attrs were not transferred (see previous errors)" },
 diff --git a/main.c b/main.c
        { RERR_MALLOC     , "error allocating core memory buffers" },
        { RERR_PARTIAL    , "some files/attrs were not transferred (see previous errors)" },
 diff --git a/main.c b/main.c

-index 2ef2f47..45159d3 100644

 --- a/main.c
 +++ b/main.c
 --- a/main.c
 +++ b/main.c

-@@ -167,8 +167,11 @@ static void wait_process_with_flush(pid_t pid, int *exit_code_ptr)
+@@ -181,8 +181,11 @@ static void wait_process_with_flush(pid_t pid, int *exit_code_ptr)

                        *exit_code_ptr = RERR_TERMINATED;
                else
                        *exit_code_ptr = RERR_WAITCHILD;
                        *exit_code_ptr = RERR_TERMINATED;
                else
                        *exit_code_ptr = RERR_WAITCHILD;


@@ -67,7 +65,7 @@ index 2ef2f47..45159d3 100644
  }
  
  void write_del_stats(int f)
  }
  
  void write_del_stats(int f)

-@@ -1389,6 +1392,14 @@ RETSIGTYPE remember_children(UNUSED(int val))
+@@ -1445,6 +1448,14 @@ RETSIGTYPE remember_children(UNUSED(int val))

                                break;
                        }
                }
                                break;
                        }
                }


@@ -82,7 +80,7 @@ index 2ef2f47..45159d3 100644
        }
  #endif
  #ifndef HAVE_SIGACTION
        }
  #endif
  #ifndef HAVE_SIGACTION

-@@ -1447,6 +1458,12 @@ static RETSIGTYPE rsync_panic_handler(UNUSED(int whatsig))
+@@ -1502,6 +1513,12 @@ static RETSIGTYPE rsync_panic_handler(UNUSED(int whatsig))

  }
  #endif
  
  }
  #endif
  


@@ -95,7 +93,7 @@ index 2ef2f47..45159d3 100644
  
  int main(int argc,char *argv[])
  {
  
  int main(int argc,char *argv[])
  {

-@@ -1469,6 +1486,11 @@ int main(int argc,char *argv[])
+@@ -1524,6 +1541,11 @@ int main(int argc,char *argv[])

        SIGACTMASK(SIGFPE, rsync_panic_handler);
        SIGACTMASK(SIGABRT, rsync_panic_handler);
        SIGACTMASK(SIGBUS, rsync_panic_handler);
        SIGACTMASK(SIGFPE, rsync_panic_handler);
        SIGACTMASK(SIGABRT, rsync_panic_handler);
        SIGACTMASK(SIGBUS, rsync_panic_handler);


@@ -108,10 +106,9 @@ index 2ef2f47..45159d3 100644
  
        starttime = time(NULL);
 diff --git a/socket.c b/socket.c
  
        starttime = time(NULL);
 diff --git a/socket.c b/socket.c

-index 5df3a50..3423e18 100644

 --- a/socket.c
 +++ b/socket.c
 --- a/socket.c
 +++ b/socket.c

-@@ -518,7 +518,17 @@ int is_a_socket(int fd)
+@@ -532,7 +532,17 @@ int is_a_socket(int fd)

  static RETSIGTYPE sigchld_handler(UNUSED(int val))
  {
  #ifdef WNOHANG
  static RETSIGTYPE sigchld_handler(UNUSED(int val))
  {
  #ifdef WNOHANG