Merge branch 'busybox' into merge

3 files changed, 25 insertions, 1 deletions

diff --git a/archival/bbunzip.c b/archival/bbunzip.c
index da6f031e3..320fe4fd1 100644
--- a/archival/bbunzip.c
+++ b/archival/bbunzip.c
@@ -388,7 +388,7 @@ int gunzip_main(int argc UNUSED_PARAM, char **argv)
          * Normally, "zcat" is just "gunzip -c".
          * But if seamless magic is enabled, then we are much more clever.
          */
-        if (ENABLE_ZCAT && (!ENABLE_GUNZIP || applet_name[1] == 'c'))
+        if (ENABLE_ZCAT && applet_name[1] == 'c')
                 option_mask32 |= BBUNPK_OPT_STDOUT | BBUNPK_SEAMLESS_MAGIC;
 
         return bbunpack(argv, unpack_gz_stream, make_new_name_gunzip, /*unused:*/ NULL);
diff --git a/archival/cpio.c b/archival/cpio.c
index 0f37ffbb9..94b4b8174 100644
--- a/archival/cpio.c
+++ b/archival/cpio.c
@@ -516,6 +516,7 @@ int cpio_main(int argc UNUSED_PARAM, char **argv)
         if (archive_handle->cpio__blocks != (off_t)-1
          && !(opt & OPT_QUIET)
         ) {
+                fflush_all();
                 fprintf(stderr, "%"OFF_FMT"u blocks\n", archive_handle->cpio__blocks);
         }
 
diff --git a/archival/dpkg.c b/archival/dpkg.c
index 6f28b994c..61631bd4d 100644
--- a/archival/dpkg.c
+++ b/archival/dpkg.c
@@ -1209,6 +1209,27 @@ static char **create_list(const char *filename)
         return file_list;
 }
 
+/** This tests if the filename is an "important" directory, which might be symlinked.
+ *  Debians dpkg test if directories are used by other packages, this
+ *  implementation doesn't and would remove for ex. an lib -> usr/lib symlink.
+ */
+static int is_builtin_exclude(const char *name)
+{
+        if (*name++ != '/')
+                return 0;
+        if (index_in_strings(".\0" "etc\0" "opt\0" "srv\0" "var\0" "var/lib\0",
+                        name) >= 0)
+                return 1;
+        if (is_prefixed_with(name, "usr/")) {
+                name += sizeof("usr/") - 1;
+                if (is_prefixed_with(name, "local/"))
+                        name += sizeof("local/") - 1;
+        }
+
+        return index_in_strings("bin\0" "lib\0" "lib32\0" "lib64\0" "sbin\0",
+                        name) >= 0;
+}
+
 /* maybe i should try and hook this into remove_file.c somehow */
 static int remove_file_array(char **remove_names, char **exclude_names)
 {
@@ -1220,6 +1241,8 @@ static int remove_file_array(char **remove_names, char **exclude_names)
                 return 0;
         }
         for (i = 0; remove_names[i] != NULL; i++) {
+                if (is_builtin_exclude(remove_names[i]))
+                        continue;
                 if (exclude_names != NULL) {
                         for (j = 0; exclude_names[j] != NULL; j++) {
                                 if (strcmp(remove_names[i], exclude_names[j]) == 0) {