wok rev 544
busybox/cpio: avoid cannot make dir warnings
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Sat Apr 12 12:36:17 2008 +0200 (2008-04-12) |
parents | cdf62ef3e419 |
children | 7bc2d8431489 |
files | busybox/receipt busybox/stuff/busybox-1.10.0-cpio-mkdir.u |
line diff
1.1 --- a/busybox/receipt Fri Apr 11 20:54:30 2008 +0000 1.2 +++ b/busybox/receipt Sat Apr 12 12:36:17 2008 +0200 1.3 @@ -18,6 +18,7 @@ 1.4 patch -p0 < stuff/$PACKAGE-$VERSION-vcsa2txt.u 1.5 patch -p0 < stuff/$PACKAGE-$VERSION-cpio.u 1.6 patch -p0 < stuff/$PACKAGE-$VERSION-dhcpc.u 1.7 + patch -p0 < stuff/$PACKAGE-$VERSION-cpio-mkdir.u 1.8 cp stuff/$PACKAGE-$VERSION.config $PACKAGE-$VERSION/.config 1.9 cd $PACKAGE-$VERSION 1.10 make oldconfig
2.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 2.2 +++ b/busybox/stuff/busybox-1.10.0-cpio-mkdir.u Sat Apr 12 12:36:17 2008 +0200 2.3 @@ -0,0 +1,11 @@ 2.4 +--- busybox-1.10.0/archival/libunarchive/data_extract_all.c 2.5 ++++ busybox-1.10.0/archival/libunarchive/data_extract_all.c 2.6 +@@ -77,7 +77,7 @@ 2.7 + } 2.8 + case S_IFDIR: 2.9 + res = mkdir(file_header->name, file_header->mode); 2.10 +- if ((res == -1) && (errno != EISDIR) 2.11 ++ if ((res == -1) && (errno != EISDIR) && (errno != EEXIST) 2.12 + && !(archive_handle->flags & ARCHIVE_EXTRACT_QUIET) 2.13 + ) { 2.14 + bb_perror_msg("cannot make dir %s", file_header->name);