wok diff busybox/stuff/busybox-1.10.0-cpio-mkdir.u @ rev 751
busybox/script: catch EOF (was hanging with screen=text)
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Tue May 06 15:21:54 2008 +0000 (2008-05-06) |
parents | b796e9417abb |
children |
line diff
1.1 --- a/busybox/stuff/busybox-1.10.0-cpio-mkdir.u Sat Apr 12 12:36:17 2008 +0200 1.2 +++ b/busybox/stuff/busybox-1.10.0-cpio-mkdir.u Tue May 06 15:21:54 2008 +0000 1.3 @@ -1,6 +1,16 @@ 1.4 --- busybox-1.10.0/archival/libunarchive/data_extract_all.c 1.5 +++ busybox-1.10.0/archival/libunarchive/data_extract_all.c 1.6 -@@ -77,7 +77,7 @@ 1.7 +@@ -38,7 +38,8 @@ 1.8 + } 1.9 + } 1.10 + else if (statbuf.st_mtime <= file_header->mtime) { 1.11 +- if (!(archive_handle->flags & ARCHIVE_EXTRACT_QUIET)) { 1.12 ++ if (!(archive_handle->flags & ARCHIVE_EXTRACT_QUIET) && 1.13 ++ (file_header->mode & S_IFMT) != S_IFDIR) { 1.14 + bb_error_msg("%s not created: newer or " 1.15 + "same age file exists", file_header->name); 1.16 + } 1.17 +@@ -77,7 +78,7 @@ 1.18 } 1.19 case S_IFDIR: 1.20 res = mkdir(file_header->name, file_header->mode);