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