Apple-2gs-SW/hush
1
0
Fork 0
mirror of https://github.com/sheumann/hush.git synced 2024-07-17 12:28:58 +00:00
Code Issues Projects Releases Wiki Activity

Fix a bug where cpio wouldnt work unless -u was specified

Browse Source
This commit is contained in:
Glenn L McGrath 2003-11-15 23:44:31 +00:00
parent 5699b8525e
commit 8dc8cb133c
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
archival/libunarchive/data_extract_all.c
View File

@ -49,18 +49,20 @@ extern void data_extract_all(archive_handle_t *archive_handle)
else if (archive_handle->flags & ARCHIVE_EXTRACT_NEWER) { else if (archive_handle->flags & ARCHIVE_EXTRACT_NEWER) {
/* Remove the existing entry if its older than the extracted entry */ /* Remove the existing entry if its older than the extracted entry */
struct stat statbuf; struct stat statbuf;
if ((lstat(file_header->name, &statbuf) == -1) && (errno != ENOENT)) { if (lstat(file_header->name, &statbuf) == -1) {
bb_perror_msg_and_die("Couldnt stat old file"); if (errno != ENOENT) {
bb_perror_msg_and_die("Couldnt stat old file");
}
} }
if (statbuf.st_mtime <= file_header->mtime) { else if (statbuf.st_mtime <= file_header->mtime) {
if (!(archive_handle->flags & ARCHIVE_EXTRACT_QUIET)) { if (!(archive_handle->flags & ARCHIVE_EXTRACT_QUIET)) {
bb_error_msg("%s not created: newer or same age file exists", file_header->name); bb_error_msg("%s not created: newer or same age file exists", file_header->name);
} }
data_skip(archive_handle); data_skip(archive_handle);
return; return;
} }
if ((unlink(file_header->name) == -1) && (errno != ENOENT)) { else if ((unlink(file_header->name) == -1) && (errno != EISDIR)) {
bb_perror_msg_and_die("Couldnt remove old file"); bb_perror_msg_and_die("Couldnt remove old file %s", file_header->name);
} }
} }
@ -76,22 +78,19 @@ extern void data_extract_all(archive_handle_t *archive_handle)
switch(file_header->mode & S_IFMT) { switch(file_header->mode & S_IFMT) {
case S_IFREG: { case S_IFREG: {
/* Regular file */ /* Regular file */
unlink(file_header->name);
dst_fd = bb_xopen(file_header->name, O_WRONLY | O_CREAT | O_EXCL); dst_fd = bb_xopen(file_header->name, O_WRONLY | O_CREAT | O_EXCL);
archive_copy_file(archive_handle, dst_fd); archive_copy_file(archive_handle, dst_fd);
close(dst_fd); close(dst_fd);
break; break;
} }
case S_IFDIR: case S_IFDIR:
unlink(file_header->name);
res = mkdir(file_header->name, file_header->mode); res = mkdir(file_header->name, file_header->mode);
if ((res == -1) && !(archive_handle->flags & ARCHIVE_EXTRACT_QUIET)) { if ((errno != EISDIR) && (res == -1) && !(archive_handle->flags & ARCHIVE_EXTRACT_QUIET)) {
bb_perror_msg("extract_archive: %s", file_header->name); bb_perror_msg("extract_archive: %s", file_header->name);
} }
break; break;
case S_IFLNK: case S_IFLNK:
/* Symlink */ /* Symlink */
unlink(file_header->name);
res = symlink(file_header->link_name, file_header->name); res = symlink(file_header->link_name, file_header->name);
if ((res == -1) && !(archive_handle->flags & ARCHIVE_EXTRACT_QUIET)) { if ((res == -1) && !(archive_handle->flags & ARCHIVE_EXTRACT_QUIET)) {
bb_perror_msg("Cannot create symlink from %s to '%s'", file_header->name, file_header->link_name); bb_perror_msg("Cannot create symlink from %s to '%s'", file_header->name, file_header->link_name);
@ -101,7 +100,6 @@ extern void data_extract_all(archive_handle_t *archive_handle)
case S_IFBLK: case S_IFBLK:
case S_IFCHR: case S_IFCHR:
case S_IFIFO: case S_IFIFO:
unlink(file_header->name);
res = mknod(file_header->name, file_header->mode, file_header->device); res = mknod(file_header->name, file_header->mode, file_header->device);
if ((res == -1) && !(archive_handle->flags & ARCHIVE_EXTRACT_QUIET)) { if ((res == -1) && !(archive_handle->flags & ARCHIVE_EXTRACT_QUIET)) {
bb_perror_msg("Cannot create node %s", file_header->name); bb_perror_msg("Cannot create node %s", file_header->name);