Apple-2gs-SW/hush
1
0
Fork 0
mirror of https://github.com/sheumann/hush.git synced 2024-12-21 23:29:34 +00:00
Code Issues Projects Releases Wiki Activity

tar: fix --to-command wrt short writes

Browse Source 
function                                             old     new   delta
bb_copyfd_exact_size                                  51      98     +47
bb_full_fd_action                                    362     394     +32
get_header_tar                                      1546    1558     +12
data_extract_to_command                              430     439      +9
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 4/0 up/down: 100/0)             Total: 100 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2010-06-26 18:11:44 +02:00
parent 894fa0ad62
commit d0a8a0d312
2 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
archival/libunarchive/data_extract_to_command.c
View File

@ -108,7 +108,7 @@ void FAST_FUNC data_extract_to_command(archive_handle_t *archive_handle)
close(p[0]); close(p[0]);
/* Our caller is expected to do signal(SIGPIPE, SIG_IGN) /* Our caller is expected to do signal(SIGPIPE, SIG_IGN)
* so that we don't die if child don't read all the input: */ * so that we don't die if child don't read all the input: */
bb_copyfd_exact_size(archive_handle->src_fd, p[1], file_header->size); bb_copyfd_exact_size(archive_handle->src_fd, p[1], -file_header->size);
close(p[1]); close(p[1]);
if (safe_waitpid(pid, &status, 0) == -1) if (safe_waitpid(pid, &status, 0) == -1)

21
libbb/copyfd.c
View File

@ -9,8 +9,10 @@
#include "libbb.h" #include "libbb.h"
/* Used by NOFORK applets (e.g. cat) - must not use xmalloc */ /* Used by NOFORK applets (e.g. cat) - must not use xmalloc.
* size < 0 means "ignore write errors", used by tar --to-command
* size = 0 means "copy till EOF"
*/
static off_t bb_full_fd_action(int src_fd, int dst_fd, off_t size) static off_t bb_full_fd_action(int src_fd, int dst_fd, off_t size)
{ {
int status = -1; int status = -1;
@ -21,6 +23,12 @@ static off_t bb_full_fd_action(int src_fd, int dst_fd, off_t size)
#else #else
char *buffer; char *buffer;
int buffer_size; int buffer_size;
bool continue_on_write_error = 0;
if (size < 0) {
size = -size;
continue_on_write_error = 1;
}
if (size > 0 && size <= 4 * 1024) if (size > 0 && size <= 4 * 1024)
goto use_small_buf; goto use_small_buf;
@ -63,8 +71,11 @@ static off_t bb_full_fd_action(int src_fd, int dst_fd, off_t size)
if (dst_fd >= 0) { if (dst_fd >= 0) {
ssize_t wr = full_write(dst_fd, buffer, rd); ssize_t wr = full_write(dst_fd, buffer, rd);
if (wr < rd) { if (wr < rd) {
bb_perror_msg(bb_msg_write_error); if (!continue_on_write_error) {
break; bb_perror_msg(bb_msg_write_error);
break;
}
dst_fd = -1;
} }
} }
total += rd; total += rd;
@ -108,7 +119,7 @@ off_t FAST_FUNC bb_copyfd_size(int fd1, int fd2, off_t size)
void FAST_FUNC bb_copyfd_exact_size(int fd1, int fd2, off_t size) void FAST_FUNC bb_copyfd_exact_size(int fd1, int fd2, off_t size)
{ {
off_t sz = bb_copyfd_size(fd1, fd2, size); off_t sz = bb_copyfd_size(fd1, fd2, size);
if (sz == size) if (sz == (size >= 0 ? size : -size))
return; return;
if (sz != -1) if (sz != -1)
bb_error_msg_and_die("short read"); bb_error_msg_and_die("short read");