aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRon Yorston <rmy@pobox.com>2015-07-15 09:55:32 +0100
committerRon Yorston <rmy@pobox.com>2015-07-15 10:09:22 +0100
commita08314a5ac85a613ef1c8b1d14badae7e7324409 (patch)
tree7a6612e955299dbae6d67cd74e2fcf57845a6b27
parent630af5002f1f10b9906d366e667391a2301158ee (diff)
downloadbusybox-w32-a08314a5ac85a613ef1c8b1d14badae7e7324409.tar.gz
busybox-w32-a08314a5ac85a613ef1c8b1d14badae7e7324409.tar.bz2
busybox-w32-a08314a5ac85a613ef1c8b1d14badae7e7324409.zip
archival: provide dummy check_errors_in_children for WIN32
-rw-r--r--archival/libarchive/open_transformer.c11
-rw-r--r--archival/rpm2cpio.c2
-rw-r--r--archival/tar.c2
3 files changed, 10 insertions, 5 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
73void check_errors_in_children(int signo) 72void 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 */
159void check_errors_in_children(int signo UNUSED_PARAM)
160{
161 bb_got_signal = 0;
162}
163
160void FAST_FUNC fork_transformer(int fd, const char *transform_prog) 164void 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 */
diff --git a/archival/rpm2cpio.c b/archival/rpm2cpio.c
index 7703629cb..7057570f5 100644
--- a/archival/rpm2cpio.c
+++ b/archival/rpm2cpio.c
@@ -88,7 +88,7 @@ int rpm2cpio_main(int argc UNUSED_PARAM, char **argv)
88 close(rpm_fd); 88 close(rpm_fd);
89 } 89 }
90 90
91 if (SEAMLESS_COMPRESSION && !ENABLE_PLATFORM_MINGW32) { 91 if (SEAMLESS_COMPRESSION) {
92 check_errors_in_children(0); 92 check_errors_in_children(0);
93 return bb_got_signal; 93 return bb_got_signal;
94 } 94 }
diff --git a/archival/tar.c b/archival/tar.c
index d1b0e475d..0dd675f64 100644
--- a/archival/tar.c
+++ b/archival/tar.c
@@ -1235,12 +1235,10 @@ int tar_main(int argc UNUSED_PARAM, char **argv)
1235 if (ENABLE_FEATURE_CLEAN_UP /* && tar_handle->src_fd != STDIN_FILENO */) 1235 if (ENABLE_FEATURE_CLEAN_UP /* && tar_handle->src_fd != STDIN_FILENO */)
1236 close(tar_handle->src_fd); 1236 close(tar_handle->src_fd);
1237 1237
1238#if !ENABLE_PLATFORM_MINGW32
1239 if (SEAMLESS_COMPRESSION || OPT_COMPRESS) { 1238 if (SEAMLESS_COMPRESSION || OPT_COMPRESS) {
1240 /* Set bb_got_signal to 1 if a child died with !0 exitcode */ 1239 /* Set bb_got_signal to 1 if a child died with !0 exitcode */
1241 check_errors_in_children(0); 1240 check_errors_in_children(0);
1242 } 1241 }
1243#endif
1244 1242
1245 return bb_got_signal; 1243 return bb_got_signal;
1246} 1244}