summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPascal Bellard <pascal.bellard@ads-lu.com>2010-10-17 22:54:51 (GMT)
committer Denys Vlasenko <vda.linux@googlemail.com>2010-10-17 22:54:51 (GMT)
commit873bb31d1703aae080d1928b5928c0011a944485 (patch)
treef3199f7bbab43ecc1ee020ec20e7ccb342060d53
parentcadf90184c2c74e2c37161efe55cd05fb04e0c59 (diff)
downloadbusybox-873bb31d1703aae080d1928b5928c0011a944485.tar.gz
busybox-873bb31d1703aae080d1928b5928c0011a944485.tar.bz2
cpio: avoid 'not created: newer or same age file exists' message for dirs
Signed-off-by: Pascal Bellard <pascal.bellard@ads-lu.com> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--archival/libunarchive/data_extract_all.c4
-rwxr-xr-xtestsuite/cpio.tests10
2 files changed, 13 insertions, 1 deletions
diff --git a/archival/libunarchive/data_extract_all.c b/archival/libunarchive/data_extract_all.c
index cc549cd..5fb1ab2 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);
}
diff --git a/testsuite/cpio.tests b/testsuite/cpio.tests
index 05b92db..4cd441a 100755
--- a/testsuite/cpio.tests
+++ b/testsuite/cpio.tests
@@ -116,6 +116,16 @@ link
" "" ""
SKIP=
+# avoid 'not created: newer or same age file exists' message for directories
+rm -rf cpio.testdir cpio.testdir2 2>/dev/null
+mkdir cpio.testdir
+testing "cpio extracts in existing directory" \
+"$ECHO -ne '$hexdump' | bzcat | cpio -id 2>&1; echo \$?" \
+"\
+1 blocks
+0
+" "" ""
+SKIP=
# Clean up
rm -rf cpio.testdir cpio.testdir2 2>/dev/null