1 Igor Yu. Zhbanov wrote:
2 > I am using rsync compiled with Cygwin on windows.
3 > I must call rsync from the *.bat script (I don't want to use a bash on Windows)
4 > and I have noticed that in the case when program compiled by Cygwin crashes
5 > via segmentation fault and default SIGSEGV handler is called, then it
6 > terminates process with exit status 0 as I see it from my *.bat script.
7 > (But if I invoke a program from bash (compiled with Cygwin too) I will see
8 > error code 139 as expected.)
10 > It is a Cygwin's problem, not an rsync's, but to use it on windows and
11 > to distinguish situations when rsync crashes and when it exits normally,
12 > I have written signal handler which terminates process with code 50.
13 > You may use conventional 139. Also signal handler writes corresponding
14 > message to log file.
16 > By the way. When I terminate rsync in daemon mode by pressing Control-C,
17 > it writes an error to log. May be this is not an error but info or notice?
19 I'm not sure I like this, but if you run into the cygwin problem, this might
22 To use this patch, run these commands for a successful build:
24 patch -p1 <patches/catch_crash_signals.diff
25 ./configure (optional if already run)
28 based-on: 109dbc0b7535e8f8094802182f9067bfdc88dfc9
29 diff --git a/errcode.h b/errcode.h
33 #define RERR_TIMEOUT 30 /* timeout in data send/receive */
34 #define RERR_CONTIMEOUT 35 /* timeout waiting for daemon connection */
36 +#define RERR_WECRASHED 50 /* We have crashed. */
38 /* Although it doesn't seem to be specified anywhere,
39 * ssh and the shell seem to return these values:
41 diff --git a/log.c b/log.c
44 @@ -92,6 +92,7 @@ struct {
45 { RERR_TERMINATED , "sibling process terminated abnormally" },
46 { RERR_SIGNAL1 , "received SIGUSR1" },
47 { RERR_SIGNAL , "received SIGINT, SIGTERM, or SIGHUP" },
48 + { RERR_WECRASHED , "rsync caught a CRASH-causing signal" },
49 { RERR_WAITCHILD , "waitpid() failed" },
50 { RERR_MALLOC , "error allocating core memory buffers" },
51 { RERR_PARTIAL , "some files/attrs were not transferred (see previous errors)" },
52 diff --git a/main.c b/main.c
55 @@ -215,8 +215,11 @@ static void wait_process_with_flush(pid_t pid, int *exit_code_ptr)
56 *exit_code_ptr = RERR_TERMINATED;
58 *exit_code_ptr = RERR_WAITCHILD;
61 *exit_code_ptr = WEXITSTATUS(status);
62 + if (*exit_code_ptr == RERR_WECRASHED)
63 + *exit_code_ptr = RERR_CRASHED;
67 void write_del_stats(int f)
68 @@ -1635,6 +1638,14 @@ void remember_children(UNUSED(int val))
72 + if (WIFSIGNALED(status)) {
74 + "rsync error: (1) Child proccess has unexpectedly died with signal %d\n",
76 + } else if (WIFEXITED(status) && WEXITSTATUS(status) == RERR_WECRASHED) {
78 + "rsync error: (1) Child proccess has CRASHED.\n");
82 #ifndef HAVE_SIGACTION
83 @@ -1688,6 +1699,13 @@ static void rsync_panic_handler(UNUSED(int whatsig))
87 +static void rsync_crash_handler(UNUSED(int whatsig))
89 + log_exit(RERR_WECRASHED, __FILE__, __LINE__);
91 + _exit(RERR_WECRASHED);
94 static void unset_env_var(const char *var)
97 @@ -1704,7 +1722,6 @@ static void unset_env_var(const char *var)
102 int main(int argc,char *argv[])
105 @@ -1728,6 +1745,11 @@ int main(int argc,char *argv[])
106 SIGACTMASK(SIGFPE, rsync_panic_handler);
107 SIGACTMASK(SIGABRT, rsync_panic_handler);
108 SIGACTMASK(SIGBUS, rsync_panic_handler);
110 + SIGACTMASK(SIGSEGV, rsync_crash_handler);
111 + SIGACTMASK(SIGFPE, rsync_crash_handler);
112 + SIGACTMASK(SIGABRT, rsync_crash_handler);
113 + SIGACTMASK(SIGBUS, rsync_crash_handler);
116 SIGACTMASK(SIGINFO, siginfo_handler);
117 diff --git a/socket.c b/socket.c
120 @@ -522,7 +522,17 @@ int is_a_socket(int fd)
121 static void sigchld_handler(UNUSED(int val))
124 - while (waitpid(-1, NULL, WNOHANG) > 0) {}
126 + while (waitpid(-1, &status, WNOHANG) > 0) {
127 + if (WIFSIGNALED(status)) {
129 + "rsync error: (3) Child proccess has unexpectedly died with signal %d\n",
131 + } else if (WIFEXITED(status) && WEXITSTATUS(status) == RERR_WECRASHED) {
133 + "rsync error: (3) Child proccess has CRASHED.\n");
137 #ifndef HAVE_SIGACTION
138 signal(SIGCHLD, sigchld_handler);