Merge branch 'busybox' into merge

4 files changed, 7 insertions, 7 deletions

diff --git a/archival/bbunzip.c b/archival/bbunzip.c
index 467996071..fb5deb0ce 100644
--- a/archival/bbunzip.c
+++ b/archival/bbunzip.c
@@ -417,7 +417,7 @@ int gunzip_main(int argc UNUSED_PARAM, char **argv)
 //usage:       "Decompress to stdout"
 
 //config:config BUNZIP2
-//config:       bool "bunzip2 (8.7 kb)"
+//config:       bool "bunzip2 (9.1 kb)"
 //config:       default y
 //config:       select FEATURE_BZIP2_DECOMPRESS
 //config:       help
@@ -431,7 +431,7 @@ int gunzip_main(int argc UNUSED_PARAM, char **argv)
 //config:       should probably say N here.
 //config:
 //config:config BZCAT
-//config:       bool "bzcat (8.7 kb)"
+//config:       bool "bzcat (9 kb)"
 //config:       default y
 //config:       select FEATURE_BZIP2_DECOMPRESS
 //config:       help
@@ -487,7 +487,7 @@ int bunzip2_main(int argc UNUSED_PARAM, char **argv)
 //usage:       "Decompress to stdout"
 
 //config:config UNLZMA
-//config:       bool "unlzma (7.5 kb)"
+//config:       bool "unlzma (7.8 kb)"
 //config:       default y
 //config:       help
 //config:       unlzma is a compression utility using the Lempel-Ziv-Markov chain
@@ -496,7 +496,7 @@ int bunzip2_main(int argc UNUSED_PARAM, char **argv)
 //config:       compressors.
 //config:
 //config:config LZCAT
-//config:       bool "lzcat (7.5 kb)"
+//config:       bool "lzcat (7.8 kb)"
 //config:       default y
 //config:       help
 //config:       Alias to "unlzma -c".
diff --git a/archival/dpkg_deb.c b/archival/dpkg_deb.c
index a5a80439d..dda931169 100644
--- a/archival/dpkg_deb.c
+++ b/archival/dpkg_deb.c
@@ -5,7 +5,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config DPKG_DEB
-//config:       bool "dpkg-deb (30 kb)"
+//config:       bool "dpkg-deb (29 kb)"
 //config:       default y
 //config:       select FEATURE_SEAMLESS_GZ
 //config:       help
diff --git a/archival/lzop.c b/archival/lzop.c
index 74df8ff03..bdcc6d548 100644
--- a/archival/lzop.c
+++ b/archival/lzop.c
@@ -25,7 +25,7 @@
    "Minimalized" for busybox by Alain Knaff
 */
 //config:config LZOP
-//config:       bool "lzop (12 kb)"
+//config:       bool "lzop (13 kb)"
 //config:       default y
 //config:       help
 //config:       Lzop compression/decompresion.
diff --git a/archival/tar.c b/archival/tar.c
index 054640c01..bb82560b8 100644
--- a/archival/tar.c
+++ b/archival/tar.c
@@ -629,7 +629,7 @@ static void NOINLINE vfork_compressor(int tar_fd, const char *gzip)
                 execlp(gzip, gzip, "-f", (char *)0);
 
                 vfork_exec_errno = errno;
-                _exit(EXIT_FAILURE);
+                _exit_FAILURE();
         }
 
         /* parent */