From 17e53de99a31a4d8e1b6145899cb68023b2b58db Mon Sep 17 00:00:00 2001 From: Ron Yorston Date: Sat, 5 Jan 2019 21:13:01 +0000 Subject: tar: return correct exit code for empty tar file The WIN32 implementation of check_errors_in_children shouldn't have reset bb_got_signal as it's used to signal an error. --- archival/libarchive/open_transformer.c | 5 ----- include/bb_archive.h | 4 ++++ 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/archival/libarchive/open_transformer.c b/archival/libarchive/open_transformer.c index 399ee03a7..69f3ecc66 100644 --- a/archival/libarchive/open_transformer.c +++ b/archival/libarchive/open_transformer.c @@ -152,11 +152,6 @@ void FAST_FUNC fork_transformer(int fd, const char *transform_prog) xmove_fd(fd_pipe.rd, fd); } #else /* ENABLE_PLATFORM_MINGW */ -void check_errors_in_children(int signo UNUSED_PARAM) -{ - bb_got_signal = 0; -} - void FAST_FUNC fork_transformer(int fd, const char *transform_prog) { char *cmd; diff --git a/include/bb_archive.h b/include/bb_archive.h index 5abcdcb44..7d70ac086 100644 --- a/include/bb_archive.h +++ b/include/bb_archive.h @@ -285,7 +285,11 @@ enum { BBUNPK_SEAMLESS_MAGIC = (1 << 31) * ENABLE_ZCAT * SEAMLESS_COMPRESSION, }; +#if !ENABLE_PLATFORM_MINGW32 void check_errors_in_children(int signo); +#else +#define check_errors_in_children(s) ((void)0) +#endif #if BB_MMU void fork_transformer(int fd, int signature_skipped, -- cgit v1.2.3-55-g6feb