Updated patches to work with the current trunk.

[rsync/rsync-patches.git] / catch_crash_signals.diff

diff --git a/catch_crash_signals.diff b/catch_crash_signals.diff
index cceeaa8..01a867b 100644 (file)
--- a/catch_crash_signals.diff
+++ b/catch_crash_signals.diff
@@ -26,6 +26,7 @@ To use this patch, run these commands for a successful build:
     make
 
 diff --git a/errcode.h b/errcode.h
+index 41c5543..e9c5a28 100644
 --- a/errcode.h
 +++ b/errcode.h
 @@ -47,6 +47,8 @@
@@ -38,9 +39,10 @@ diff --git a/errcode.h b/errcode.h
   * 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
-@@ -83,6 +83,7 @@ struct {
+@@ -88,6 +88,7 @@ struct {
        { RERR_TERMINATED , "sibling process terminated abnormally" },
        { RERR_SIGNAL1    , "received SIGUSR1" },
        { RERR_SIGNAL     , "received SIGINT, SIGTERM, or SIGHUP" },
@@ -49,9 +51,10 @@ diff --git a/log.c b/log.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
-@@ -163,8 +163,11 @@ static void wait_process_with_flush(pid_t pid, int *exit_code_ptr)
+@@ -167,8 +167,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;
@@ -63,8 +66,8 @@ diff --git a/main.c b/main.c
 +      }
  }
  
- /* This function gets called from all 3 processes.  We want the client side
-@@ -1315,6 +1318,14 @@ RETSIGTYPE remember_children(UNUSED(int val))
+ void write_del_stats(int f)
+@@ -1389,6 +1392,14 @@ RETSIGTYPE remember_children(UNUSED(int val))
                                break;
                        }
                }
@@ -79,7 +82,7 @@ diff --git a/main.c b/main.c
        }
  #endif
  #ifndef HAVE_SIGACTION
-@@ -1373,6 +1384,12 @@ static RETSIGTYPE rsync_panic_handler(UNUSED(int whatsig))
+@@ -1447,6 +1458,12 @@ static RETSIGTYPE rsync_panic_handler(UNUSED(int whatsig))
  }
  #endif
  
@@ -92,7 +95,7 @@ diff --git a/main.c b/main.c
  
  int main(int argc,char *argv[])
  {
-@@ -1395,6 +1412,11 @@ int main(int argc,char *argv[])
+@@ -1469,6 +1486,11 @@ int main(int argc,char *argv[])
        SIGACTMASK(SIGFPE, rsync_panic_handler);
        SIGACTMASK(SIGABRT, rsync_panic_handler);
        SIGACTMASK(SIGBUS, rsync_panic_handler);
@@ -105,6 +108,7 @@ diff --git a/main.c b/main.c
  
        starttime = time(NULL);
 diff --git a/socket.c b/socket.c
+index 5df3a50..3423e18 100644
 --- a/socket.c
 +++ b/socket.c
 @@ -518,7 +518,17 @@ int is_a_socket(int fd)