emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tar: fix "hardlinks to symlinks chown" bug 1519.

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2010-04-09 14:11:45 +02:00
parent 02365a6ef7
commit e69ad87802
3 changed files with 82 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

102
archival/libunarchive/data_extract_all.c
View File

@ -96,58 +96,60 @@ void FAST_FUNC data_extract_all(archive_handle_t *archive_handle)
file_header->name, file_header->name,
file_header->link_target); file_header->link_target);
} }
} else { /* Hardlinks have no separate mode/ownership, skip chown/chmod */
/* Create the filesystem entry */ goto ret;
switch (file_header->mode & S_IFMT) { }
case S_IFREG: {
/* Regular file */ /* Create the filesystem entry */
int flags = O_WRONLY | O_CREAT | O_EXCL; switch (file_header->mode & S_IFMT) {
if (archive_handle->ah_flags & ARCHIVE_O_TRUNC) case S_IFREG: {
flags = O_WRONLY | O_CREAT | O_TRUNC; /* Regular file */
dst_fd = xopen3(file_header->name, int flags = O_WRONLY | O_CREAT | O_EXCL;
flags, if (archive_handle->ah_flags & ARCHIVE_O_TRUNC)
file_header->mode flags = O_WRONLY | O_CREAT | O_TRUNC;
); dst_fd = xopen3(file_header->name,
bb_copyfd_exact_size(archive_handle->src_fd, dst_fd, file_header->size); flags,
close(dst_fd); file_header->mode
break; );
bb_copyfd_exact_size(archive_handle->src_fd, dst_fd, file_header->size);
close(dst_fd);
break;
}
case S_IFDIR:
res = mkdir(file_header->name, file_header->mode);
if ((res == -1)
&& (errno != EISDIR) /* btw, Linux doesn't return this */
&& (errno != EEXIST)
&& !(archive_handle->ah_flags & ARCHIVE_EXTRACT_QUIET)
) {
bb_perror_msg("can't make dir %s", file_header->name);
} }
case S_IFDIR: break;
res = mkdir(file_header->name, file_header->mode); case S_IFLNK:
if ((res == -1) /* Symlink */
&& (errno != EISDIR) /* btw, Linux doesn't return this */ res = symlink(file_header->link_target, file_header->name);
&& (errno != EEXIST) if ((res == -1)
&& !(archive_handle->ah_flags & ARCHIVE_EXTRACT_QUIET) && !(archive_handle->ah_flags & ARCHIVE_EXTRACT_QUIET)
) { ) {
bb_perror_msg("can't make dir %s", file_header->name); bb_perror_msg("can't create %slink "
} "from %s to %s", "sym",
break; file_header->name,
case S_IFLNK: file_header->link_target);
/* Symlink */
res = symlink(file_header->link_target, file_header->name);
if ((res == -1)
&& !(archive_handle->ah_flags & ARCHIVE_EXTRACT_QUIET)
) {
bb_perror_msg("can't create %slink "
"from %s to %s", "sym",
file_header->name,
file_header->link_target);
}
break;
case S_IFSOCK:
case S_IFBLK:
case S_IFCHR:
case S_IFIFO:
res = mknod(file_header->name, file_header->mode, file_header->device);
if ((res == -1)
&& !(archive_handle->ah_flags & ARCHIVE_EXTRACT_QUIET)
) {
bb_perror_msg("can't create node %s", file_header->name);
}
break;
default:
bb_error_msg_and_die("unrecognized file type");
} }
break;
case S_IFSOCK:
case S_IFBLK:
case S_IFCHR:
case S_IFIFO:
res = mknod(file_header->name, file_header->mode, file_header->device);
if ((res == -1)
&& !(archive_handle->ah_flags & ARCHIVE_EXTRACT_QUIET)
) {
bb_perror_msg("can't create node %s", file_header->name);
}
break;
default:
bb_error_msg_and_die("unrecognized file type");
} }
if (!(archive_handle->ah_flags & ARCHIVE_DONT_RESTORE_OWNER)) { if (!(archive_handle->ah_flags & ARCHIVE_DONT_RESTORE_OWNER)) {

1
archival/libunarchive/header_verbose_list.c
View File

@ -61,6 +61,7 @@ void FAST_FUNC header_verbose_list(const file_header_t *file_header)
#endif /* FEATURE_TAR_UNAME_GNAME */ #endif /* FEATURE_TAR_UNAME_GNAME */
/* NB: GNU tar shows "->" for symlinks and "link to" for hardlinks */
if (file_header->link_target) { if (file_header->link_target) {
printf(" -> %s", file_header->link_target); printf(" -> %s", file_header->link_target);
} }

29
testsuite/tar.tests
View File

@ -69,6 +69,35 @@ dr-xr-x--- input_dir
" \ " \
"" "" "" ""
testing "tar symlinks mode" '\
rm -rf input_* test.tar 2>/dev/null
>input_file
chmod 741 input_file
ln -s input_file input_soft
mkdir input_dir
chmod 550 input_dir
ln input_file input_dir
ln input_soft input_dir
tar cf test.tar input_*
tar tvf test.tar | sed "s/.*[0-9] input/input/"
tar xf test.tar 2>&1
echo Ok: $?
ls -l . input_dir/* | grep input_ | sed "s/\\(^[^ ]*\\) .* input/\\1 input/"
' "\
input_dir/
input_dir/input_file
input_dir/input_soft -> input_file
input_file -> input_dir/input_file
input_soft -> input_dir/input_soft
Ok: 0
-rwxr----x input_dir/input_file
lrwxrwxrwx input_file
dr-xr-x--- input_dir
-rwxr----x input_file
lrwxrwxrwx input_file
" \
"" ""
optional FEATURE_TAR_LONG_OPTIONS optional FEATURE_TAR_LONG_OPTIONS
testing "tar --overwrite" "\ testing "tar --overwrite" "\
rm -rf input_* test.tar 2>/dev/null rm -rf input_* test.tar 2>/dev/null