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

Change hardlink handling for tar to work the same way as cpio

Browse Source
This commit is contained in:
Glenn L McGrath 2003-08-14 02:55:15 +00:00
parent 062913f662
commit 3d5828fb6d
2 changed files with 46 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
archival/libunarchive/data_extract_all.c
View File

@ -39,54 +39,52 @@ extern void data_extract_all(archive_handle_t *archive_handle)
free(name); free(name);
} }
/* Create the filesystem entry */ /* Handle hard links seperately */
switch(file_header->mode & S_IFMT) { if (!S_ISLNK(file_header->mode) && (file_header->link_name) && (file_header->size == 0)) {
case S_IFREG: { /* hard link */
#ifdef CONFIG_CPIO res = link(file_header->link_name, file_header->name);
if (file_header->link_name && file_header->size == 0) { if ((res == -1) && !(archive_handle->flags & ARCHIVE_EXTRACT_QUIET)) {
/* hard link */ bb_perror_msg("Couldnt create hard link");
res = link(file_header->link_name, file_header->name); }
if ((res == -1) && !(archive_handle->flags & ARCHIVE_EXTRACT_QUIET)) { } else {
bb_perror_msg("Couldnt create hard link"); /* Create the filesystem entry */
} switch(file_header->mode & S_IFMT) {
} else case S_IFREG: {
#endif
{
/* Regular file */ /* Regular file */
unlink(file_header->name); 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:
unlink(file_header->name);
res = mkdir(file_header->name, file_header->mode);
if ((res == -1) && !(archive_handle->flags & ARCHIVE_EXTRACT_QUIET)) {
bb_perror_msg("extract_archive: %s", file_header->name);
}
break;
case S_IFLNK:
/* Symlink */
unlink(file_header->name);
res = symlink(file_header->link_name, file_header->name);
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);
}
break;
case S_IFSOCK:
case S_IFBLK:
case S_IFCHR:
case S_IFIFO:
unlink(file_header->name);
res = mknod(file_header->name, file_header->mode, file_header->device);
if ((res == -1) && !(archive_handle->flags & ARCHIVE_EXTRACT_QUIET)) {
bb_perror_msg("Cannot create node %s", file_header->name);
}
break;
default:
bb_error_msg_and_die("Unrecognised file type");
} }
case S_IFDIR:
unlink(file_header->name);
res = mkdir(file_header->name, file_header->mode);
if ((res == -1) && !(archive_handle->flags & ARCHIVE_EXTRACT_QUIET)) {
bb_perror_msg("extract_archive: %s", file_header->name);
}
break;
case S_IFLNK:
/* Symlink */
unlink(file_header->name);
res = symlink(file_header->link_name, file_header->name);
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);
}
break;
case S_IFSOCK:
case S_IFBLK:
case S_IFCHR:
case S_IFIFO:
unlink(file_header->name);
res = mknod(file_header->name, file_header->mode, file_header->device);
if ((res == -1) && !(archive_handle->flags & ARCHIVE_EXTRACT_QUIET)) {
bb_perror_msg("Cannot create node %s", file_header->name);
}
break;
default:
bb_error_msg_and_die("Unrecognised file type");
} }
chmod(file_header->name, file_header->mode); chmod(file_header->name, file_header->mode);

8
archival/libunarchive/get_header_tar.c
View File

@ -128,8 +128,12 @@ extern char get_header_tar(archive_handle_t *archive_handle)
case '0': case '0':
file_header->mode |= S_IFREG; file_header->mode |= S_IFREG;
break; break;
#if 0
/* hard links are detected as entries with 0 size, a link name,
* and not being a symlink, hence we have nothing to do here */
case '1': case '1':
bb_error_msg("WARNING: Converting hard link to symlink"); break;
#endif
case '2': case '2':
file_header->mode |= S_IFLNK; file_header->mode |= S_IFLNK;
break; break;
@ -173,6 +177,7 @@ extern char get_header_tar(archive_handle_t *archive_handle)
# endif # endif
} }
#endif #endif
if (archive_handle->filter(archive_handle) == EXIT_SUCCESS) { if (archive_handle->filter(archive_handle) == EXIT_SUCCESS) {
archive_handle->action_header(archive_handle->file_header); archive_handle->action_header(archive_handle->file_header);
archive_handle->flags |= ARCHIVE_EXTRACT_QUIET; archive_handle->flags |= ARCHIVE_EXTRACT_QUIET;
@ -185,4 +190,3 @@ extern char get_header_tar(archive_handle_t *archive_handle)
return(EXIT_SUCCESS); return(EXIT_SUCCESS);
} }