summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGlenn L McGrath2003-11-20 08:00:38 +0000
committerGlenn L McGrath2003-11-20 08:00:38 +0000
commit90c9df93f3fa9fb9c6b576c92c19bbe36bdc6e52 (patch)
tree7e813cd75c06e38748da8020e30e45fabac6e896
parent0413af0e275ec0f899b2bd4f06af2c43017f8296 (diff)
downloadbusybox-90c9df93f3fa9fb9c6b576c92c19bbe36bdc6e52.zip
busybox-90c9df93f3fa9fb9c6b576c92c19bbe36bdc6e52.tar.gz
Dont attempt to unlink directories
-rw-r--r--archival/libunarchive/data_extract_all.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/archival/libunarchive/data_extract_all.c b/archival/libunarchive/data_extract_all.c
index 1a6b624..4dccb81 100644
--- a/archival/libunarchive/data_extract_all.c
+++ b/archival/libunarchive/data_extract_all.c
@@ -42,7 +42,7 @@ extern void data_extract_all(archive_handle_t *archive_handle)
/* Check if the file already exists */
if (archive_handle->flags & ARCHIVE_EXTRACT_UNCONDITIONAL) {
/* Remove the existing entry if it exists */
- if ((unlink(file_header->name) == -1) && (errno != ENOENT)) {
+ if (((file_header->mode & S_IFMT) != S_IFDIR) && (unlink(file_header->name) == -1) && (errno != ENOENT)) {
bb_perror_msg_and_die("Couldnt remove old file");
}
}