wok-next annotate busybox/stuff/busybox-1.17.1-cpio-mkdir.u @ rev 6173
Up: libgnomeprint, libgnomeprint-dev to 2.18.7.
| author | Christopher Rogers <slaxemulator@gmail.com> |
|---|---|
| date | Fri Sep 10 12:31:39 2010 +0000 (2010-09-10) |
| parents | b5f4ef5d86ec |
| children |
| rev | line source |
|---|---|
| pascal@5925 | 1 avoid 'not created: newer or same age file exists' message for directories |
| pascal@5917 | 2 --- busybox-1.17.1/archival/libunarchive/data_extract_all.c |
| pascal@5917 | 3 +++ busybox-1.17.1/archival/libunarchive/data_extract_all.c |
| pascal@5917 | 4 @@ -69,7 +69,8 @@ |
| pascal@5917 | 5 } |
| pascal@5917 | 6 } |
| pascal@5917 | 7 else if (existing_sb.st_mtime >= file_header->mtime) { |
| pascal@5917 | 8 - if (!(archive_handle->ah_flags & ARCHIVE_EXTRACT_QUIET)) { |
| pascal@5917 | 9 + if (!(archive_handle->ah_flags & ARCHIVE_EXTRACT_QUIET) |
| pascal@5917 | 10 + && (file_header->mode & S_IFMT) != S_IFDIR) { |
| pascal@5917 | 11 bb_error_msg("%s not created: newer or " |
| pascal@5917 | 12 "same age file exists", file_header->name); |
| pascal@5917 | 13 } |
| pascal@5925 | 14 |
| pascal@5925 | 15 --- busybox-1.17.1/testsuite/cpio.tests |
| pascal@5925 | 16 +++ busybox-1.17.1/testsuite/cpio.tests |
| pascal@5925 | 17 @@ -114,6 +114,16 @@ |
| pascal@5925 | 18 " "" "" |
| pascal@5925 | 19 SKIP= |
| pascal@5925 | 20 |
| pascal@5925 | 21 +# avoid 'not created: newer or same age file exists' message for directories |
| pascal@5925 | 22 +rm -rf cpio.testdir cpio.testdir2 2>/dev/null |
| pascal@5925 | 23 +mkdir cpio.testdir |
| pascal@5925 | 24 +testing "cpio extracts in existing directory" \ |
| pascal@5925 | 25 +"$ECHO -ne '$hexdump' | bzcat | cpio -id 2>&1; echo \$?" \ |
| pascal@5925 | 26 +"\ |
| pascal@5925 | 27 +1 blocks |
| pascal@5925 | 28 +0 |
| pascal@5925 | 29 +" "" "" |
| pascal@5925 | 30 +SKIP= |
| pascal@5925 | 31 |
| pascal@5925 | 32 # Clean up |
| pascal@5925 | 33 rm -rf cpio.testdir cpio.testdir2 2>/dev/null |