X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=e2fsck%2Fsigcatcher.c;h=421cd3e1ebb7b68d1f4952097744424c7845832b;hb=2db19bce8146a63b1cef19fe4628014c7f7de816;hp=faafb5725b74e9e00b4dc0ff69fed1dae2331914;hpb=00eb0eee0addfd3b7ede98b85e00dff1547838a0;p=tools%2Fe2fsprogs.git

diff --git a/e2fsck/sigcatcher.c b/e2fsck/sigcatcher.c
index faafb57..421cd3e 100644
--- a/e2fsck/sigcatcher.c
+++ b/e2fsck/sigcatcher.c
@@ -331,7 +331,8 @@ static const char *lookup_table_fallback(int num, struct str_table *table)
 	return buf;
 }
 
-static void die_signal_handler(int signum, siginfo_t *siginfo, void *context)
+static void die_signal_handler(int signum, siginfo_t *siginfo,
+			       void *context EXT2FS_ATTR((unused)))
 {
        void *stack_syms[32];
        int frames;
@@ -372,7 +373,7 @@ static void die_signal_handler(int signum, siginfo_t *siginfo, void *context)
 	       fprintf(stderr, "fault addr=%p", siginfo->si_addr);
        fprintf(stderr, "\n");
 
-#ifdef HAVE_BACKTRACE
+#if defined(HAVE_BACKTRACE) && !defined(DISABLE_BACKTRACE)
        frames = backtrace(stack_syms, 32);
        backtrace_symbols_fd(stack_syms, frames, 2);
 #endif
@@ -391,6 +392,7 @@ void sigcatcher_setup(void)
 	sigaction(SIGILL, &sa, 0);
 	sigaction(SIGBUS, &sa, 0);
 	sigaction(SIGSEGV, &sa, 0);
+	sigaction(SIGABRT, &sa, 0);
 }