diff options
author | Ron Yorston <rmy@pobox.com> | 2015-07-15 09:55:32 +0100 |
---|---|---|
committer | Ron Yorston <rmy@pobox.com> | 2015-07-15 10:09:22 +0100 |
commit | a08314a5ac85a613ef1c8b1d14badae7e7324409 (patch) | |
tree | 7a6612e955299dbae6d67cd74e2fcf57845a6b27 /archival/libarchive | |
parent | 630af5002f1f10b9906d366e667391a2301158ee (diff) | |
download | busybox-w32-a08314a5ac85a613ef1c8b1d14badae7e7324409.tar.gz busybox-w32-a08314a5ac85a613ef1c8b1d14badae7e7324409.tar.bz2 busybox-w32-a08314a5ac85a613ef1c8b1d14badae7e7324409.zip |
archival: provide dummy check_errors_in_children for WIN32
Diffstat (limited to 'archival/libarchive')
-rw-r--r-- | archival/libarchive/open_transformer.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/archival/libarchive/open_transformer.c b/archival/libarchive/open_transformer.c index c7ec4a74d..7b18aeff4 100644 --- a/archival/libarchive/open_transformer.c +++ b/archival/libarchive/open_transformer.c | |||
@@ -68,7 +68,6 @@ ssize_t FAST_FUNC xtransformer_write(transformer_state_t *xstate, const void *bu | |||
68 | return nwrote; | 68 | return nwrote; |
69 | } | 69 | } |
70 | 70 | ||
71 | #if SEAMLESS_COMPRESSION | ||
72 | #if !ENABLE_PLATFORM_MINGW32 | 71 | #if !ENABLE_PLATFORM_MINGW32 |
73 | void check_errors_in_children(int signo) | 72 | void check_errors_in_children(int signo) |
74 | { | 73 | { |
@@ -156,7 +155,12 @@ void FAST_FUNC fork_transformer(int fd, const char *transform_prog) | |||
156 | close(fd_pipe.wr); /* don't want to write to the child */ | 155 | close(fd_pipe.wr); /* don't want to write to the child */ |
157 | xmove_fd(fd_pipe.rd, fd); | 156 | xmove_fd(fd_pipe.rd, fd); |
158 | } | 157 | } |
159 | #else | 158 | #else /* ENABLE_PLATFORM_MINGW */ |
159 | void check_errors_in_children(int signo UNUSED_PARAM) | ||
160 | { | ||
161 | bb_got_signal = 0; | ||
162 | } | ||
163 | |||
160 | void FAST_FUNC fork_transformer(int fd, const char *transform_prog) | 164 | void FAST_FUNC fork_transformer(int fd, const char *transform_prog) |
161 | { | 165 | { |
162 | char *cmd; | 166 | char *cmd; |
@@ -177,6 +181,9 @@ void FAST_FUNC fork_transformer(int fd, const char *transform_prog) | |||
177 | } | 181 | } |
178 | #endif | 182 | #endif |
179 | 183 | ||
184 | |||
185 | #if SEAMLESS_COMPRESSION | ||
186 | |||
180 | /* Used by e.g. rpm which gives us a fd without filename, | 187 | /* Used by e.g. rpm which gives us a fd without filename, |
181 | * thus we can't guess the format from filename's extension. | 188 | * thus we can't guess the format from filename's extension. |
182 | */ | 189 | */ |