summaryrefslogtreecommitdiff
path: root/busybox/busybox-1.00-rc1/tar.patch
diff options
context:
space:
mode:
authorPhil Blundell <philb@gnu.org>2004-08-03 22:48:04 +0000
committerPhil Blundell <philb@gnu.org>2004-08-03 22:48:04 +0000
commitc20cb42ec8d6bc8919308e039b45b12136685452 (patch)
tree289be5b6aae514ebd502c0f5cfae4bcfeb49fc85 /busybox/busybox-1.00-rc1/tar.patch
parente323b96de179765902fb716b338187ed936333f1 (diff)
roll busybox back to 1.00-rc1 due to modprobe and other breakage in rc2
BKrev: 41101624yPfQAK2RdolnJpfMvrcJTw
Diffstat (limited to 'busybox/busybox-1.00-rc1/tar.patch')
-rw-r--r--busybox/busybox-1.00-rc1/tar.patch22
1 files changed, 22 insertions, 0 deletions
diff --git a/busybox/busybox-1.00-rc1/tar.patch b/busybox/busybox-1.00-rc1/tar.patch
new file mode 100644
index 0000000000..e080275184
--- /dev/null
+++ b/busybox/busybox-1.00-rc1/tar.patch
@@ -0,0 +1,22 @@
+--- busybox/archival/libunarchive/data_extract_all.c 2002-11-29 01:43:46.000000000 -0500
++++ busybox-new/archival/libunarchive/data_extract_all.c 2002-12-03 18:38:21.000000000 -0500
+@@ -69,6 +68,9 @@
+ case S_IFLNK:
+ /* Symlink */
+ res = symlink(file_header->link_name, file_header->name);
++ if ((res == -1) && (errno == EEXIST) && (unlink(file_header->name) == 0)) {
++ res = symlink(file_header->link_name, file_header->name);
++ }
+ if ((res == -1) && !(archive_handle->flags & ARCHIVE_EXTRACT_QUIET)) {
+ perror_msg("Cannot create symlink from %s to '%s'", file_header->name, file_header->link_name);
+ }
+@@ -78,6 +80,9 @@
+ case S_IFCHR:
+ case S_IFIFO:
+ res = mknod(file_header->name, file_header->mode, file_header->device);
++ if ((res == -1) && (errno == EEXIST) && (unlink(file_header->name) == 0)) {
++ res = mknod(file_header->name, file_header->mode, file_header->device);
++ }
+ if ((res == -1) && !(archive_handle->flags & ARCHIVE_EXTRACT_QUIET)) {
+ perror_msg("Cannot create node %s", file_header->name);
+ }