wok annotate busybox/stuff/busybox-1.10.0-cpio-mkdir.u @ rev 2213

openssh*: --libexecdir=/usr/sbin (no /usr/libexec)
author Christophe Lincoln <pankso@slitaz.org>
date Wed Feb 11 17:41:17 2009 +0100 (2009-02-11)
parents b796e9417abb
children
rev   line source
pascal@544 1 --- busybox-1.10.0/archival/libunarchive/data_extract_all.c
pascal@544 2 +++ busybox-1.10.0/archival/libunarchive/data_extract_all.c
pascal@568 3 @@ -38,7 +38,8 @@
pascal@568 4 }
pascal@568 5 }
pascal@568 6 else if (statbuf.st_mtime <= file_header->mtime) {
pascal@568 7 - if (!(archive_handle->flags & ARCHIVE_EXTRACT_QUIET)) {
pascal@568 8 + if (!(archive_handle->flags & ARCHIVE_EXTRACT_QUIET) &&
pascal@568 9 + (file_header->mode & S_IFMT) != S_IFDIR) {
pascal@568 10 bb_error_msg("%s not created: newer or "
pascal@568 11 "same age file exists", file_header->name);
pascal@568 12 }
pascal@568 13 @@ -77,7 +78,7 @@
pascal@544 14 }
pascal@544 15 case S_IFDIR:
pascal@544 16 res = mkdir(file_header->name, file_header->mode);
pascal@544 17 - if ((res == -1) && (errno != EISDIR)
pascal@544 18 + if ((res == -1) && (errno != EISDIR) && (errno != EEXIST)
pascal@544 19 && !(archive_handle->flags & ARCHIVE_EXTRACT_QUIET)
pascal@544 20 ) {
pascal@544 21 bb_perror_msg("cannot make dir %s", file_header->name);