diff options
author | Elliott Hughes <enh@google.com> | 2021-05-12 02:16:11 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-05-12 02:16:11 +0000 |
commit | 501678815fa2414579a55b11fee0e745262d2273 (patch) | |
tree | 78c0c9f84843ab122bd616e7256ae45d500e73f0 /fuse/main.c | |
parent | 0d8f8223c1766e377841386ce72b3db092f349ee (diff) | |
parent | b4b786ca611bc01daeab3a9e40db03885840ee20 (diff) | |
download | erofs-utils-android12L-d2-s6-release.tar.gz |
Merge tag 'v1.2.1' into update am: 7269cd8246 am: 8fe4f5452d am: 9c9ce2caf4 am: b4b786ca61android-12.1.0_r26android-12.1.0_r25android-12.1.0_r24android-12.1.0_r23android-12.1.0_r18android-12.1.0_r17android-12.1.0_r16android-12.1.0_r15android-12.1.0_r14android-12.1.0_r13android-12.1.0_r12android12L-d2-s8-releaseandroid12L-d2-s7-releaseandroid12L-d2-s6-releaseandroid12L-d2-s5-releaseandroid12L-d2-s4-releaseandroid12L-d2-s3-releaseandroid12L-d2-s2-releaseandroid12L-d2-s1-releaseandroid12L-d2-release
Original change: https://android-review.googlesource.com/c/platform/external/erofs-utils/+/1703646
Change-Id: I844e1f3335d0a6fa208ddf18b50ad642dfd828d8
Diffstat (limited to 'fuse/main.c')
-rw-r--r-- | fuse/main.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/fuse/main.c b/fuse/main.c index 1e24efe..c162912 100644 --- a/fuse/main.c +++ b/fuse/main.c @@ -6,7 +6,6 @@ */ #include <stdlib.h> #include <string.h> -#include <execinfo.h> #include <signal.h> #include <libgen.h> #include <fuse.h> @@ -168,6 +167,9 @@ static int optional_opt_func(void *data, const char *arg, int key, return 1; } +#if defined(HAVE_EXECINFO_H) && defined(HAVE_BACKTRACE) +#include <execinfo.h> + static void signal_handle_sigsegv(int signal) { void *array[10]; @@ -187,7 +189,7 @@ static void signal_handle_sigsegv(int signal) erofs_dump("========================================\n"); abort(); } - +#endif int main(int argc, char *argv[]) { @@ -197,11 +199,13 @@ int main(int argc, char *argv[]) erofs_init_configure(); fprintf(stderr, "%s %s\n", basename(argv[0]), cfg.c_version); +#if defined(HAVE_EXECINFO_H) && defined(HAVE_BACKTRACE) if (signal(SIGSEGV, signal_handle_sigsegv) == SIG_ERR) { fprintf(stderr, "failed to initialize signals\n"); ret = -errno; goto err; } +#endif /* parse options */ ret = fuse_opt_parse(&args, &fusecfg, option_spec, optional_opt_func); |