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?
I'm not sure I like this, but if you run into the cygwin problem, this might
prove helpful.
---- old/errcode.h
-+++ new/errcode.h
+To use this patch, run these commands for a successful build:
+
+ patch -p1 <patches/catch_crash_signals.diff
+ ./configure (optional if already run)
+ make
+
+based-on: a01e3b490eb36ccf9e704840e1b6683dab867550
+diff --git a/errcode.h b/errcode.h
+--- a/errcode.h
++++ b/errcode.h
@@ -47,6 +47,8 @@
-
#define RERR_TIMEOUT 30 /* timeout in data send/receive */
+ #define RERR_CONTIMEOUT 35 /* timeout waiting for daemon connection */
+#define RERR_WECRASHED 50 /* We have crashed. */
+
/* Although it doesn't seem to be specified anywhere,
* ssh and the shell seem to return these values:
*
---- old/log.c
-+++ new/log.c
-@@ -77,6 +77,7 @@ struct {
+diff --git a/log.c b/log.c
+--- a/log.c
++++ b/log.c
+@@ -93,6 +93,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" },
---- old/main.c
-+++ new/main.c
-@@ -137,8 +137,11 @@ static void wait_process_with_flush(pid_
+ { 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
+@@ -180,8 +180,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;
+ }
}
- /* This function gets called from all 3 processes. We want the client side
-@@ -1112,6 +1115,14 @@ static RETSIGTYPE sigchld_handler(UNUSED
+ void write_del_stats(int f)
+@@ -1432,6 +1435,14 @@ RETSIGTYPE remember_children(UNUSED(int val))
break;
}
}
}
#endif
#ifndef HAVE_SIGACTION
-@@ -1170,6 +1181,12 @@ static RETSIGTYPE rsync_panic_handler(UN
+@@ -1490,6 +1501,12 @@ static RETSIGTYPE rsync_panic_handler(UNUSED(int whatsig))
}
#endif
int main(int argc,char *argv[])
{
-@@ -1192,6 +1209,11 @@ int main(int argc,char *argv[])
+@@ -1512,6 +1529,11 @@ int main(int argc,char *argv[])
SIGACTMASK(SIGFPE, rsync_panic_handler);
SIGACTMASK(SIGABRT, rsync_panic_handler);
SIGACTMASK(SIGBUS, rsync_panic_handler);
#endif
starttime = time(NULL);
---- old/socket.c
-+++ new/socket.c
-@@ -435,7 +435,17 @@ int is_a_socket(int fd)
+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))
{
#ifdef WNOHANG