4 files changed, 7 insertions, 5 deletions

diff --git a/archival/bbunzip.c b/archival/bbunzip.c
index d96790b89..a195434e4 100644
--- a/archival/bbunzip.c
+++ b/archival/bbunzip.c
@@ -307,7 +307,7 @@ int gunzip_main(int argc UNUSED_PARAM, char **argv)
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //usage:#define bunzip2_trivial_usage
-//usage:       "[OPTIONS] [FILE]..."
+//usage:       "[-cf] [FILE]..."
 //usage:#define bunzip2_full_usage "\n\n"
 //usage:       "Decompress FILEs (or stdin)\n"
 //usage:     "\nOptions:"
diff --git a/archival/cpio.c b/archival/cpio.c
index 7cd8ee8a7..a2d74dc79 100644
--- a/archival/cpio.c
+++ b/archival/cpio.c
@@ -370,7 +370,7 @@ int cpio_main(int argc UNUSED_PARAM, char **argv)
                 if (cpio_fmt[0] != 'n') /* we _require_ "-H newc" */
                         bb_show_usage();
                 if (opt & CPIO_OPT_FILE) {
-                        xmove_fd(xopen3(cpio_filename, O_WRONLY | O_CREAT | O_TRUNC, 0666), STDOUT_FILENO);
+                        xmove_fd(xopen(cpio_filename, O_WRONLY | O_CREAT | O_TRUNC), STDOUT_FILENO);
                 }
  dump:
                 return cpio_o();
diff --git a/archival/dpkg.c b/archival/dpkg.c
index b36c26198..07f01501b 100644
--- a/archival/dpkg.c
+++ b/archival/dpkg.c
@@ -1524,8 +1524,8 @@ static char FAST_FUNC filter_rename_config(archive_handle_t *archive_handle)
                 buf = xmalloc(4096);
                 md5_begin(&md5);
                 while ((count = safe_read(fd, buf, 4096)) > 0)
-                        md5_hash(buf, count, &md5);
-                md5_end(buf, &md5); /* using buf as result storage */
+                        md5_hash(&md5, buf, count);
+                md5_end(&md5, buf); /* using buf as result storage */
                 close(fd);
 
                 md5line = xmalloc(16 * 2 + 2 + strlen(name_ptr) + 1);
diff --git a/archival/libunarchive/data_extract_all.c b/archival/libunarchive/data_extract_all.c
index cc549cd78..5fb1ab2ae 100644
--- a/archival/libunarchive/data_extract_all.c
+++ b/archival/libunarchive/data_extract_all.c
@@ -69,7 +69,9 @@ void FAST_FUNC data_extract_all(archive_handle_t *archive_handle)
                         }
                 }
                 else if (existing_sb.st_mtime >= file_header->mtime) {
-                        if (!(archive_handle->ah_flags & ARCHIVE_EXTRACT_QUIET)) {
+                        if (!(archive_handle->ah_flags & ARCHIVE_EXTRACT_QUIET)
+                         && !S_ISDIR(file_header->mode)
+                        ) {
                                 bb_error_msg("%s not created: newer or "
                                         "same age file exists", file_header->name);
                         }