From f3b40e64002b4e45acd2044918813ceee75d0f53 Mon Sep 17 00:00:00 2001
From: Marcus Holland-Moritz <github@mhxnet.de>
Date: Wed, 9 Dec 2020 12:14:21 +0100
Subject: [PATCH] Install fatal signal handlers in `mkdwarfs` and `dwarfs`

---
 src/dwarfs.cpp   | 5 +++++
 src/mkdwarfs.cpp | 2 ++
 2 files changed, 7 insertions(+)

diff --git a/src/dwarfs.cpp b/src/dwarfs.cpp
index dfbfa3fb..4c64840a 100644
--- a/src/dwarfs.cpp
+++ b/src/dwarfs.cpp
@@ -28,6 +28,7 @@
 #include <filesystem>
 
 #include <folly/Conv.h>
+#include <folly/experimental/symbolizer/SignalHandler.h>
 
 #include <fuse3/fuse_lowlevel.h>
 
@@ -449,6 +450,10 @@ int run_fuse(struct fuse_args& args) {
     usage(s_opts.progname);
   }
 
+  if (fuse_opts.foreground) {
+    folly::symbolizer::installFatalSignalHandler();
+  }
+
   struct fuse_lowlevel_ops fsops;
 
   ::memset(&fsops, 0, sizeof(fsops));
diff --git a/src/mkdwarfs.cpp b/src/mkdwarfs.cpp
index 4063df88..79389f9a 100644
--- a/src/mkdwarfs.cpp
+++ b/src/mkdwarfs.cpp
@@ -45,6 +45,7 @@
 
 #include <folly/Conv.h>
 #include <folly/FileUtil.h>
+#include <folly/experimental/symbolizer/SignalHandler.h>
 #include <folly/gen/String.h>
 
 #include <fmt/format.h>
@@ -624,6 +625,7 @@ int mkdwarfs(int argc, char** argv) {
 
 int main(int argc, char** argv) {
   try {
+    folly::symbolizer::installFatalSignalHandler();
     return mkdwarfs(argc, argv);
   } catch (std::exception const& e) {
     std::cerr << "ERROR: " << folly::exceptionStr(e) << std::endl;