The patches for 3.3.0.

[rsync-patches.git] / catch_crash_signals.diff

diff --git a/catch_crash_signals.diff b/catch_crash_signals.diff
index 751eeaa42e13b31c7ed8db1cebd2964f621ec9f4..e1aed5fa4f3e35feeafbe64976ba56d057c4c7e6 100644 (file)
--- a/catch_crash_signals.diff
+++ b/catch_crash_signals.diff
@@ -1,18 +1,18 @@
 Igor Yu. Zhbanov wrote:
-> I am using rsync compiled with Cygwin on windows. 
+> I am using rsync compiled with Cygwin on windows.
 > I must call rsync from the *.bat script (I don't want to use a bash on Windows)
 > and I have noticed that in the case when program compiled by Cygwin crashes
 > via segmentation fault and default SIGSEGV handler is called, then it
 > terminates process with exit status 0 as I see it from my *.bat script.
 > (But if I invoke a program from bash (compiled with Cygwin too) I will see
 > error code 139 as expected.)
-> 
+>
 > It is a Cygwin's problem, not an rsync's, but to use it on windows and
 > to distinguish situations when rsync crashes and when it exits normally,
 > I have written signal handler which terminates process with code 50.
 > You may use conventional 139. Also signal handler writes corresponding
 > message to log file.
-> 
+>
 > By the way. When I terminate rsync in daemon mode by pressing Control-C,
 > it writes an error to log. May be this is not an error but info or notice?
 
@@ -25,6 +25,7 @@ To use this patch, run these commands for a successful build:
     ./configure                                  (optional if already run)
     make
 
+based-on: 6c8ca91c731b7bf2b081694bda85b7dadc2b7aff
 diff --git a/errcode.h b/errcode.h
 --- a/errcode.h
 +++ b/errcode.h
@@ -40,18 +41,18 @@ diff --git a/errcode.h b/errcode.h
 diff --git a/log.c b/log.c
 --- a/log.c
 +++ b/log.c
-@@ -83,6 +83,7 @@ struct {
+@@ -92,6 +92,7 @@ struct {
        { RERR_TERMINATED , "sibling process terminated abnormally" },
        { RERR_SIGNAL1    , "received SIGUSR1" },
        { RERR_SIGNAL     , "received SIGINT, SIGTERM, or SIGHUP" },
 +      { RERR_WECRASHED  , "rsync caught a CRASH-causing signal" },
        { RERR_WAITCHILD  , "waitpid() failed" },
        { RERR_MALLOC     , "error allocating core memory buffers" },
-       { RERR_PARTIAL    , "some files could not be transferred" },
+       { RERR_PARTIAL    , "some files/attrs were not transferred (see previous errors)" },
 diff --git a/main.c b/main.c
 --- a/main.c
 +++ b/main.c
-@@ -163,8 +163,11 @@ static void wait_process_with_flush(pid_t pid, int *exit_code_ptr)
+@@ -218,8 +218,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 +64,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)
+@@ -1637,6 +1640,14 @@ void remember_children(UNUSED(int val))
                                break;
                        }
                }
@@ -79,20 +80,29 @@ diff --git a/main.c b/main.c
        }
  #endif
  #ifndef HAVE_SIGACTION
-@@ -1373,6 +1384,12 @@ static RETSIGTYPE rsync_panic_handler(UNUSED(int whatsig))
+@@ -1690,6 +1701,13 @@ static void rsync_panic_handler(UNUSED(int whatsig))
  }
  #endif
  
-+static RETSIGTYPE rsync_crash_handler(UNUSED(int whatsig))
++static void rsync_crash_handler(UNUSED(int whatsig))
 +{
 +      log_exit(RERR_WECRASHED, __FILE__, __LINE__);
 +      logfile_close();
 +      _exit(RERR_WECRASHED);
 +}
++
+ static void unset_env_var(const char *var)
+ {
+ #ifdef HAVE_UNSETENV
+@@ -1706,7 +1724,6 @@ static void unset_env_var(const char *var)
+ #endif
+ }
  
+-
  int main(int argc,char *argv[])
  {
-@@ -1395,6 +1412,11 @@ int main(int argc,char *argv[])
+       int ret;
+@@ -1730,6 +1747,11 @@ int main(int argc,char *argv[])
        SIGACTMASK(SIGFPE, rsync_panic_handler);
        SIGACTMASK(SIGABRT, rsync_panic_handler);
        SIGACTMASK(SIGBUS, rsync_panic_handler);
@@ -102,13 +112,13 @@ diff --git a/main.c b/main.c
 +      SIGACTMASK(SIGABRT, rsync_crash_handler);
 +      SIGACTMASK(SIGBUS, rsync_crash_handler);
  #endif
- 
-       starttime = time(NULL);
+ #ifdef SIGINFO
+       SIGACTMASK(SIGINFO, siginfo_handler);
 diff --git a/socket.c b/socket.c
 --- a/socket.c
 +++ b/socket.c
-@@ -518,7 +518,17 @@ int is_a_socket(int fd)
- static RETSIGTYPE sigchld_handler(UNUSED(int val))
+@@ -522,7 +522,17 @@ int is_a_socket(int fd)
+ static void sigchld_handler(UNUSED(int val))
  {
  #ifdef WNOHANG
 -      while (waitpid(-1, NULL, WNOHANG) > 0) {}