wok diff busybox/stuff/busybox-1.17.0-cpio-mkdir.u @ rev 5773

Up busybox (1.17.0)
author Pascal Bellard <pascal.bellard@slitaz.org>
date Tue Jul 06 15:09:01 2010 +0200 (2010-07-06)
parents
children 1ed09465c0ae
line diff
     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/busybox/stuff/busybox-1.17.0-cpio-mkdir.u	Tue Jul 06 15:09:01 2010 +0200
     1.3 @@ -0,0 +1,12 @@
     1.4 +--- busybox-1.16.1/archival/libunarchive/data_extract_all.c
     1.5 ++++ busybox-1.16.1/archival/libunarchive/data_extract_all.c
     1.6 +@@ -69,7 +69,8 @@
     1.7 + 			}
     1.8 + 		}
     1.9 + 		else if (existing_sb.st_mtime >= file_header->mtime) {
    1.10 +-			if (!(archive_handle->ah_flags & ARCHIVE_EXTRACT_QUIET)) {
    1.11 ++			if (!(archive_handle->ah_flags & ARCHIVE_EXTRACT_QUIET)
    1.12 ++				&& (file_header->mode & S_IFMT) != S_IFDIR) {
    1.13 + 				bb_error_msg("%s not created: newer or "
    1.14 + 					"same age file exists", file_header->name);
    1.15 + 			}