Merge branch 'maint' into next

[tools/e2fsprogs.git] / e2fsck / sigcatcher.c

diff --git a/e2fsck/sigcatcher.c b/e2fsck/sigcatcher.c
index faafb57..a9d3b7f 100644 (file)
--- a/e2fsck/sigcatcher.c
+++ b/e2fsck/sigcatcher.c
@@ -331,10 +331,9 @@ 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;
        const char *cp;
 
        fprintf(stderr, "Signal (%d) %s ", signum,
@@ -372,9 +371,14 @@ 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
-       frames = backtrace(stack_syms, 32);
-       backtrace_symbols_fd(stack_syms, frames, 2);
+#if defined(HAVE_BACKTRACE) && !defined(DISABLE_BACKTRACE)
+       {
+              void *stack_syms[32];
+              int frames;
+
+              frames = backtrace(stack_syms, 32);
+              backtrace_symbols_fd(stack_syms, frames, 2);
+       }
 #endif
        exit(FSCK_ERROR);
 }
@@ -391,6 +395,7 @@ void sigcatcher_setup(void)
        sigaction(SIGILL, &sa, 0);
        sigaction(SIGBUS, &sa, 0);
        sigaction(SIGSEGV, &sa, 0);
+       sigaction(SIGABRT, &sa, 0);
 }