wok-6.x view busybox/stuff/busybox-1.17.1-cpio-mkdir.u @ rev 6058
commoncpp2: Upgrade to 1.8.0
| author | Matthew Sheets <rcx@zoominternet.net> |
|---|---|
| date | Thu Aug 19 22:18:58 2010 +0000 (2010-08-19) |
| parents | b5f4ef5d86ec |
| children |
line source
1 avoid 'not created: newer or same age file exists' message for directories
2 --- busybox-1.17.1/archival/libunarchive/data_extract_all.c
3 +++ busybox-1.17.1/archival/libunarchive/data_extract_all.c
4 @@ -69,7 +69,8 @@
5 }
6 }
7 else if (existing_sb.st_mtime >= file_header->mtime) {
8 - if (!(archive_handle->ah_flags & ARCHIVE_EXTRACT_QUIET)) {
9 + if (!(archive_handle->ah_flags & ARCHIVE_EXTRACT_QUIET)
10 + && (file_header->mode & S_IFMT) != S_IFDIR) {
11 bb_error_msg("%s not created: newer or "
12 "same age file exists", file_header->name);
13 }
15 --- busybox-1.17.1/testsuite/cpio.tests
16 +++ busybox-1.17.1/testsuite/cpio.tests
17 @@ -114,6 +114,16 @@
18 " "" ""
19 SKIP=
21 +# avoid 'not created: newer or same age file exists' message for directories
22 +rm -rf cpio.testdir cpio.testdir2 2>/dev/null
23 +mkdir cpio.testdir
24 +testing "cpio extracts in existing directory" \
25 +"$ECHO -ne '$hexdump' | bzcat | cpio -id 2>&1; echo \$?" \
26 +"\
27 +1 blocks
28 +0
29 +" "" ""
30 +SKIP=
32 # Clean up
33 rm -rf cpio.testdir cpio.testdir2 2>/dev/null