wok-6.x view busybox/stuff/busybox-1.10.0-cpio-mkdir.u @ rev 1017
Add conky (light system monitor)
| author | Christophe Lincoln <pankso@slitaz.org> |
|---|---|
| date | Tue Jul 08 23:34:19 2008 +0200 (2008-07-08) |
| parents | b796e9417abb |
| children |
line source
1 --- busybox-1.10.0/archival/libunarchive/data_extract_all.c
2 +++ busybox-1.10.0/archival/libunarchive/data_extract_all.c
3 @@ -38,7 +38,8 @@
4 }
5 }
6 else if (statbuf.st_mtime <= file_header->mtime) {
7 - if (!(archive_handle->flags & ARCHIVE_EXTRACT_QUIET)) {
8 + if (!(archive_handle->flags & ARCHIVE_EXTRACT_QUIET) &&
9 + (file_header->mode & S_IFMT) != S_IFDIR) {
10 bb_error_msg("%s not created: newer or "
11 "same age file exists", file_header->name);
12 }
13 @@ -77,7 +78,7 @@
14 }
15 case S_IFDIR:
16 res = mkdir(file_header->name, file_header->mode);
17 - if ((res == -1) && (errno != EISDIR)
18 + if ((res == -1) && (errno != EISDIR) && (errno != EEXIST)
19 && !(archive_handle->flags & ARCHIVE_EXTRACT_QUIET)
20 ) {
21 bb_perror_msg("cannot make dir %s", file_header->name);