wok annotate busybox/stuff/busybox-1.12.0-cpio-mkdir.u @ rev 1591

gnupg: update 1.4.9
author Paul Issott <paul@slitaz.org>
date Fri Oct 17 13:06:12 2008 +0000 (2008-10-17)
parents
children d84c7ed6eeb4
rev   line source
pascal@1299 1 --- busybox-1.12.0/archival/libunarchive/data_extract_all.c
pascal@1299 2 +++ busybox-1.12.0/archival/libunarchive/data_extract_all.c
pascal@1299 3 @@ -38,7 +38,8 @@ void FAST_FUNC data_extract_all(archive_
pascal@1299 4 }
pascal@1299 5 }
pascal@1299 6 else if (statbuf.st_mtime <= file_header->mtime) {
pascal@1299 7 - if (!(archive_handle->ah_flags & ARCHIVE_EXTRACT_QUIET)) {
pascal@1299 8 + if (!(archive_handle->ah_flags & ARCHIVE_EXTRACT_QUIET) &&
pascal@1299 9 + (file_header->mode & S_IFMT) != S_IFDIR) {
pascal@1299 10 bb_error_msg("%s not created: newer or "
pascal@1299 11 "same age file exists", file_header->name);
pascal@1299 12 }
pascal@1299 13 @@ -77,7 +78,7 @@ void FAST_FUNC data_extract_all(archive_
pascal@1299 14 }
pascal@1299 15 case S_IFDIR:
pascal@1299 16 res = mkdir(file_header->name, file_header->mode);
pascal@1299 17 - if ((res == -1) && (errno != EISDIR)
pascal@1299 18 + if ((res == -1) && (errno != EISDIR) && (errno != EEXIST)
pascal@1299 19 && !(archive_handle->ah_flags & ARCHIVE_EXTRACT_QUIET)
pascal@1299 20 ) {
pascal@1299 21 bb_perror_msg("cannot make dir %s", file_header->name);