Merge branch 'busybox' into merge

Conflicts:
	archival/libarchive/open_transformer.c
	libbb/lineedit.c
	miscutils/man.c

1 files changed, 30 insertions, 40 deletions

diff --git a/archival/tar.c b/archival/tar.c
index 63d844a3a..e00ed26a8 100644
--- a/archival/tar.c
+++ b/archival/tar.c
@@ -160,13 +160,6 @@
 #define block_buf bb_common_bufsiz1
 
 
-#if !ENABLE_FEATURE_SEAMLESS_GZ && !ENABLE_FEATURE_SEAMLESS_BZ2
-/* Do not pass gzip flag to writeTarFile() */
-#define writeTarFile(tar_fd, verboseFlag, recurseFlags, include, exclude, gzip) \
-        writeTarFile(tar_fd, verboseFlag, recurseFlags, include, exclude)
-#endif
-
-
 #if ENABLE_FEATURE_TAR_CREATE
 
 /*
@@ -623,21 +616,12 @@ static int FAST_FUNC writeFileToTarball(const char *fileName, struct stat *statb
         return TRUE;
 }
 
-#if ENABLE_FEATURE_SEAMLESS_GZ || ENABLE_FEATURE_SEAMLESS_BZ2
-# if !(ENABLE_FEATURE_SEAMLESS_GZ && ENABLE_FEATURE_SEAMLESS_BZ2)
-#  define vfork_compressor(tar_fd, gzip) vfork_compressor(tar_fd)
-# endif
+#if SEAMLESS_COMPRESSION
 /* Don't inline: vfork scares gcc and pessimizes code */
-static void NOINLINE vfork_compressor(int tar_fd, int gzip)
+static void NOINLINE vfork_compressor(int tar_fd, const char *gzip)
 {
         pid_t gzipPid;
-# if ENABLE_FEATURE_SEAMLESS_GZ && ENABLE_FEATURE_SEAMLESS_BZ2
-        const char *zip_exec = (gzip == 1) ? "gzip" : "bzip2";
-# elif ENABLE_FEATURE_SEAMLESS_GZ
-        const char *zip_exec = "gzip";
-# else /* only ENABLE_FEATURE_SEAMLESS_BZ2 */
-        const char *zip_exec = "bzip2";
-# endif
+
         // On Linux, vfork never unpauses parent early, although standard
         // allows for that. Do we want to waste bytes checking for it?
 # define WAIT_FOR_CHILD 0
@@ -651,11 +635,6 @@ static void NOINLINE vfork_compressor(int tar_fd, int gzip)
 
         signal(SIGPIPE, SIG_IGN); /* we only want EPIPE on errors */
 
-# if defined(__GNUC__) && __GNUC__
-        /* Avoid vfork clobbering */
-        (void) &zip_exec;
-# endif
-
         gzipPid = xvfork();
 
         if (gzipPid == 0) {
@@ -671,7 +650,7 @@ static void NOINLINE vfork_compressor(int tar_fd, int gzip)
                 xmove_fd(gzipDataPipe.rd, 0);
                 xmove_fd(tar_fd, 1);
                 /* exec gzip/bzip2 program/applet */
-                BB_EXECLP(zip_exec, zip_exec, "-f", (char *)0);
+                BB_EXECLP(gzip, gzip, "-f", (char *)0);
                 vfork_exec_errno = errno;
                 _exit(EXIT_FAILURE);
         }
@@ -694,16 +673,21 @@ static void NOINLINE vfork_compressor(int tar_fd, int gzip)
 # endif
         if (vfork_exec_errno) {
                 errno = vfork_exec_errno;
-                bb_perror_msg_and_die("can't execute '%s'", zip_exec);
+                bb_perror_msg_and_die("can't execute '%s'", gzip);
         }
 }
-#endif /* ENABLE_FEATURE_SEAMLESS_GZ || ENABLE_FEATURE_SEAMLESS_BZ2 */
+#endif /* SEAMLESS_COMPRESSION */
 
 
+#if !SEAMLESS_COMPRESSION
+/* Do not pass gzip flag to writeTarFile() */
+#define writeTarFile(tar_fd, verboseFlag, recurseFlags, include, exclude, gzip) \
+        writeTarFile(tar_fd, verboseFlag, recurseFlags, include, exclude)
+#endif
 /* gcc 4.2.1 inlines it, making code bigger */
 static NOINLINE int writeTarFile(int tar_fd, int verboseFlag,
         int recurseFlags, const llist_t *include,
-        const llist_t *exclude, int gzip)
+        const llist_t *exclude, const char *gzip)
 {
         int errorFlag = FALSE;
         struct TarBallInfo tbInfo;
@@ -716,7 +700,7 @@ static NOINLINE int writeTarFile(int tar_fd, int verboseFlag,
          * can avoid including the tarball into itself....  */
         xfstat(tbInfo.tarFd, &tbInfo.tarFileStatBuf, "can't stat tar file");
 
-#if ENABLE_FEATURE_SEAMLESS_GZ || ENABLE_FEATURE_SEAMLESS_BZ2
+#if SEAMLESS_COMPRESSION
         if (gzip)
                 vfork_compressor(tbInfo.tarFd, gzip);
 #endif
@@ -751,7 +735,7 @@ static NOINLINE int writeTarFile(int tar_fd, int verboseFlag,
         if (errorFlag)
                 bb_error_msg("error exit delayed from previous errors");
 
-#if ENABLE_FEATURE_SEAMLESS_GZ || ENABLE_FEATURE_SEAMLESS_BZ2
+#if SEAMLESS_COMPRESSION
         if (gzip) {
                 int status;
                 if (safe_waitpid(-1, &status, 0) == -1)
@@ -766,7 +750,7 @@ static NOINLINE int writeTarFile(int tar_fd, int verboseFlag,
 #else
 int writeTarFile(int tar_fd, int verboseFlag,
         int recurseFlags, const llist_t *include,
-        const llist_t *exclude, int gzip);
+        const llist_t *exclude, const char *gzip);
 #endif /* FEATURE_TAR_CREATE */
 
 #if ENABLE_FEATURE_TAR_FROM
@@ -1151,18 +1135,24 @@ int tar_main(int argc UNUSED_PARAM, char **argv)
         if (base_dir)
                 xchdir(base_dir);
 
-        //if (SEAMLESS_COMPRESSION || OPT_COMPRESS)
+        //if (SEAMLESS_COMPRESSION)
         //      /* We need to know whether child (gzip/bzip/etc) exits abnormally */
         //      signal(SIGCHLD, check_errors_in_children);
 
         /* Create an archive */
         if (opt & OPT_CREATE) {
-#if ENABLE_FEATURE_SEAMLESS_GZ || ENABLE_FEATURE_SEAMLESS_BZ2
-                int zipMode = 0;
-                if (ENABLE_FEATURE_SEAMLESS_GZ && (opt & OPT_GZIP))
-                        zipMode = 1;
-                if (ENABLE_FEATURE_SEAMLESS_BZ2 && (opt & OPT_BZIP2))
-                        zipMode = 2;
+#if SEAMLESS_COMPRESSION
+                const char *zipMode = NULL;
+                if (opt & OPT_COMPRESS)
+                        zipMode = "compress";
+                if (opt & OPT_GZIP)
+                        zipMode = "gzip";
+                if (opt & OPT_BZIP2)
+                        zipMode = "bzip2";
+                if (opt & OPT_LZMA)
+                        zipMode = "lzma";
+                if (opt & OPT_XZ)
+                        zipMode = "xz";
 #endif
                 /* NB: writeTarFile() closes tar_handle->src_fd */
                 return writeTarFile(tar_handle->src_fd, verboseFlag,
@@ -1173,7 +1163,7 @@ int tar_main(int argc UNUSED_PARAM, char **argv)
         }
 
         if (opt & OPT_ANY_COMPRESS) {
-                USE_FOR_MMU(IF_DESKTOP(long long) int FAST_FUNC (*xformer)(transformer_aux_data_t *aux, int src_fd, int dst_fd);)
+                USE_FOR_MMU(IF_DESKTOP(long long) int FAST_FUNC (*xformer)(transformer_state_t *xstate);)
                 USE_FOR_NOMMU(const char *xformer_prog;)
 
                 if (opt & OPT_COMPRESS)
@@ -1192,7 +1182,7 @@ int tar_main(int argc UNUSED_PARAM, char **argv)
                         USE_FOR_MMU(xformer = unpack_xz_stream;)
                         USE_FOR_NOMMU(xformer_prog = "unxz";)
 
-                open_transformer_with_sig(tar_handle->src_fd, xformer, xformer_prog);
+                fork_transformer_with_sig(tar_handle->src_fd, xformer, xformer_prog);
                 /* Can't lseek over pipes */
                 tar_handle->seek = seek_by_read;
                 /*tar_handle->offset = 0; - already is */