summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--archival/ar.c2
-rw-r--r--archival/libunarchive/Makefile.in3
-rw-r--r--archival/libunarchive/archive_copy_file.c44
-rw-r--r--archival/libunarchive/archive_xread.c33
-rw-r--r--archival/libunarchive/archive_xread_all.c2
-rw-r--r--archival/libunarchive/archive_xread_all_eof.c2
-rw-r--r--archival/libunarchive/data_extract_all.c2
-rw-r--r--archival/libunarchive/data_extract_to_stdout.c2
-rw-r--r--archival/libunarchive/get_header_tar.c2
-rw-r--r--archival/libunarchive/seek_by_char.c16
-rw-r--r--archival/tar.c17
-rw-r--r--coreutils/cat.c2
-rw-r--r--include/libbb.h5
-rw-r--r--include/unarchive.h2
-rw-r--r--libbb/copy_file.c2
-rw-r--r--libbb/copyfd.c61
-rw-r--r--libbb/print_file.c2
-rw-r--r--networking/ftpgetput.c4
18 files changed, 55 insertions, 148 deletions
diff --git a/archival/ar.c b/archival/ar.c
index 57ec927..32ecd57 100644
--- a/archival/ar.c
+++ b/archival/ar.c
@@ -59,7 +59,7 @@ static void data_extract_regular_file(archive_handle_t *archive_handle)
file_header = archive_handle->file_header;
dst_fd = bb_xopen(file_header->name, O_WRONLY | O_CREAT);
- archive_copy_file(archive_handle, dst_fd);
+ bb_copyfd_eof(archive_handle->src_fd, dst_fd, file_header->size);
close(dst_fd);
chmod(file_header->name, file_header->mode);
diff --git a/archival/libunarchive/Makefile.in b/archival/libunarchive/Makefile.in
index c9dec09..09b0571 100644
--- a/archival/libunarchive/Makefile.in
+++ b/archival/libunarchive/Makefile.in
@@ -37,15 +37,12 @@ LIBUNARCHIVE-y:= \
header_list.o \
header_verbose_list.o \
\
- archive_xread.o \
archive_xread_all.o \
archive_xread_all_eof.o \
\
seek_by_char.o \
seek_by_jump.o \
\
- archive_copy_file.o \
-\
data_align.o \
find_list_entry.o \
open_transformer.o \
diff --git a/archival/libunarchive/archive_copy_file.c b/archival/libunarchive/archive_copy_file.c
deleted file mode 100644
index 675bc6f..0000000
--- a/archival/libunarchive/archive_copy_file.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#include <unistd.h>
-
-#include "libbb.h"
-#include "unarchive.h"
-
-extern void archive_copy_file(const archive_handle_t *archive_handle, const int dst_fd)
-{
- char buffer[512];
- off_t chunksize = archive_handle->file_header->size;
-
- while (chunksize != 0) {
- size_t size;
- if (chunksize > 512) {
- size = 512;
- } else {
- size = chunksize;
- }
-// archive_xread_all(archive_handle, buffer, size);
- size = archive_xread(archive_handle, buffer, size);
-
- if (write(dst_fd, buffer, size) != size) {
- bb_error_msg_and_die ("Short write");
- }
- chunksize -= size;
- }
-
- return;
-}
diff --git a/archival/libunarchive/archive_xread.c b/archival/libunarchive/archive_xread.c
deleted file mode 100644
index 59b4d77..0000000
--- a/archival/libunarchive/archive_xread.c
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Library General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include "unarchive.h"
-#include "libbb.h"
-
-extern ssize_t archive_xread(const archive_handle_t *archive_handle, unsigned char *buf, const size_t count)
-{
- ssize_t size;
-
- size = bb_full_read(archive_handle->src_fd, buf, count);
- if (size < 0) {
- bb_perror_msg_and_die("Read error");
- }
-
- return(size);
-}
diff --git a/archival/libunarchive/archive_xread_all.c b/archival/libunarchive/archive_xread_all.c
index cfe046b..ba9ade2 100644
--- a/archival/libunarchive/archive_xread_all.c
+++ b/archival/libunarchive/archive_xread_all.c
@@ -24,7 +24,7 @@ extern void archive_xread_all(const archive_handle_t *archive_handle, void *buf,
{
ssize_t size;
- size = archive_xread(archive_handle, buf, count);
+ size = bb_full_read(archive_handle->src_fd, buf, count);
if (size != count) {
bb_error_msg_and_die("Short read");
}
diff --git a/archival/libunarchive/archive_xread_all_eof.c b/archival/libunarchive/archive_xread_all_eof.c
index 23719cd..8084e35 100644
--- a/archival/libunarchive/archive_xread_all_eof.c
+++ b/archival/libunarchive/archive_xread_all_eof.c
@@ -24,7 +24,7 @@ extern ssize_t archive_xread_all_eof(archive_handle_t *archive_handle, unsigned
{
ssize_t size;
- size = archive_xread(archive_handle, buf, count);
+ size = bb_full_read(archive_handle->src_fd, buf, count);
if ((size != 0) && (size != count)) {
bb_perror_msg_and_die("Short read, read %d of %d", size, count);
}
diff --git a/archival/libunarchive/data_extract_all.c b/archival/libunarchive/data_extract_all.c
index 4dccb81..bf3be5b 100644
--- a/archival/libunarchive/data_extract_all.c
+++ b/archival/libunarchive/data_extract_all.c
@@ -79,7 +79,7 @@ extern void data_extract_all(archive_handle_t *archive_handle)
case S_IFREG: {
/* Regular file */
dst_fd = bb_xopen(file_header->name, O_WRONLY | O_CREAT | O_EXCL);
- archive_copy_file(archive_handle, dst_fd);
+ bb_copyfd_size(archive_handle->src_fd, dst_fd, file_header->size);
close(dst_fd);
break;
}
diff --git a/archival/libunarchive/data_extract_to_stdout.c b/archival/libunarchive/data_extract_to_stdout.c
index 8be2fa2..ce5d4b8 100644
--- a/archival/libunarchive/data_extract_to_stdout.c
+++ b/archival/libunarchive/data_extract_to_stdout.c
@@ -18,5 +18,5 @@
extern void data_extract_to_stdout(archive_handle_t *archive_handle)
{
- archive_copy_file(archive_handle, fileno(stdout));
+ bb_copyfd_eof(archive_handle->src_fd, fileno(stdout));
}
diff --git a/archival/libunarchive/get_header_tar.c b/archival/libunarchive/get_header_tar.c
index d55189f..603535a 100644
--- a/archival/libunarchive/get_header_tar.c
+++ b/archival/libunarchive/get_header_tar.c
@@ -57,7 +57,7 @@ extern char get_header_tar(archive_handle_t *archive_handle)
/* Align header */
data_align(archive_handle, 512);
- if (archive_xread(archive_handle, tar.raw, 512) != 512) {
+ if (bb_full_read(archive_handle->src_fd, tar.raw, 512) != 512) {
/* Assume end of file */
return(EXIT_FAILURE);
}
diff --git a/archival/libunarchive/seek_by_char.c b/archival/libunarchive/seek_by_char.c
index 77da4ef..c031561 100644
--- a/archival/libunarchive/seek_by_char.c
+++ b/archival/libunarchive/seek_by_char.c
@@ -26,19 +26,7 @@
*/
extern void seek_by_char(const archive_handle_t *archive_handle, const unsigned int jump_size)
{
- unsigned int remaining = jump_size;
- unsigned int read_amount;
- RESERVE_CONFIG_BUFFER(buf, BUFSIZ);
-
- while (remaining > 0) {
- if (remaining > BUFSIZ) {
- read_amount = BUFSIZ;
- } else {
- read_amount = remaining;
- }
- read_amount = archive_xread(archive_handle, buf, read_amount);
- remaining -= read_amount;
+ if (jump_size) {
+ bb_full_fd_action(archive_handle->src_fd, -1, jump_size, NULL);
}
-
- RELEASE_CONFIG_BUFFER(buf);
}
diff --git a/archival/tar.c b/archival/tar.c
index b3fa447..cf9bc04 100644
--- a/archival/tar.c
+++ b/archival/tar.c
@@ -414,8 +414,7 @@ static int writeFileToTarball(const char *fileName, struct stat *statbuf,
if ((tbInfo->hlInfo == NULL)
&& (S_ISREG(statbuf->st_mode))) {
int inputFileFd;
- char buffer[BUFSIZ];
- ssize_t size = 0, readSize = 0;
+ ssize_t readSize = 0;
/* open the file we want to archive, and make sure all is well */
if ((inputFileFd = open(fileName, O_RDONLY)) < 0) {
@@ -424,18 +423,8 @@ static int writeFileToTarball(const char *fileName, struct stat *statbuf,
}
/* write the file to the archive */
- while ((size = bb_full_read(inputFileFd, buffer, sizeof(buffer))) > 0) {
- if (bb_full_write(tbInfo->tarFd, buffer, size) != size) {
- /* Output file seems to have a problem */
- bb_error_msg(bb_msg_io_error, fileName);
- return (FALSE);
- }
- readSize += size;
- }
- if (size == -1) {
- bb_error_msg(bb_msg_io_error, fileName);
- return (FALSE);
- }
+ readSize = bb_copyfd_eof(inputFileFd, tbInfo->tarFd);
+
/* Pad the file up to the tar block size */
for (; (readSize % TAR_BLOCK_SIZE) != 0; readSize++) {
write(tbInfo->tarFd, "\0", 1);
diff --git a/coreutils/cat.c b/coreutils/cat.c
index 8652757..62af6c5 100644
--- a/coreutils/cat.c
+++ b/coreutils/cat.c
@@ -54,7 +54,7 @@ extern int cat_main(int argc, char **argv)
do {
if ((f = bb_wfopen_input(*argv)) != NULL) {
- int r = bb_copyfd(fileno(f), STDOUT_FILENO, 0);
+ int r = bb_copyfd_eof(fileno(f), STDOUT_FILENO);
bb_fclose_nonstdin(f);
if (r >= 0) {
continue;
diff --git a/include/libbb.h b/include/libbb.h
index 22a77e6..5ff4911 100644
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -136,7 +136,8 @@ extern long *find_pid_by_name( const char* pidName);
extern char *find_real_root_device_name(const char* name);
extern char *bb_get_line_from_file(FILE *file);
extern char *bb_get_chomped_line_from_file(FILE *file);
-extern int bb_copyfd(int fd1, int fd2, const off_t chunksize);
+extern int bb_copyfd_size(int fd1, int fd2, const off_t size);
+extern int bb_copyfd_eof(int fd1, int fd2);
extern void bb_xprint_and_close_file(FILE *file);
extern int bb_xprint_file_by_name(const char *filename);
extern char bb_process_escape_sequence(const char **ptr);
@@ -480,6 +481,6 @@ extern void xregcomp(regex_t *preg, const char *regex, int cflags);
#define HASH_SHA1 1
#define HASH_MD5 2
extern int hash_fd(int fd, const size_t size, const uint8_t hash_algo, uint8_t *hashval);
-
+extern size_t bb_full_fd_action(int src_fd, int dst_fd, const size_t size, ssize_t (*action)(int fd, const void *, size_t));
#endif /* __LIBCONFIG_H__ */
diff --git a/include/unarchive.h b/include/unarchive.h
index 79ee99e..bbf11b5 100644
--- a/include/unarchive.h
+++ b/include/unarchive.h
@@ -90,12 +90,10 @@ extern char get_header_tar_gz(archive_handle_t *archive_handle);
extern void seek_by_jump(const archive_handle_t *archive_handle, const unsigned int amount);
extern void seek_by_char(const archive_handle_t *archive_handle, const unsigned int amount);
-extern ssize_t archive_xread(const archive_handle_t *archive_handle, unsigned char *buf, const size_t count);
extern void archive_xread_all(const archive_handle_t *archive_handle, void *buf, const size_t count);
extern ssize_t archive_xread_all_eof(archive_handle_t *archive_handle, unsigned char *buf, size_t count);
extern void data_align(archive_handle_t *archive_handle, const unsigned short boundary);
-extern void archive_copy_file(const archive_handle_t *archive_handle, const int dst_fd);
extern const llist_t *find_list_entry(const llist_t *list, const char *filename);
extern int uncompressStream(int src_fd, int dst_fd);
diff --git a/libbb/copy_file.c b/libbb/copy_file.c
index 5808ca4..c9d239f 100644
--- a/libbb/copy_file.c
+++ b/libbb/copy_file.c
@@ -181,7 +181,7 @@ int copy_file(const char *source, const char *dest, int flags)
}
}
- if (bb_copyfd(fileno(sfp), fileno(dfp), 0) == -1)
+ if (bb_copyfd_eof(fileno(sfp), fileno(dfp)) == -1)
status = -1;
if (fclose(dfp) < 0) {
diff --git a/libbb/copyfd.c b/libbb/copyfd.c
index 05bed6b..0787c81 100644
--- a/libbb/copyfd.c
+++ b/libbb/copyfd.c
@@ -29,44 +29,55 @@
#define BUFSIZ 4096
#endif
-/* If chunksize is 0 copy until EOF */
-extern int bb_copyfd(int fd1, int fd2, const off_t chunksize)
+/* If size is 0 copy until EOF */
+extern size_t bb_full_fd_action(int src_fd, int dst_fd, const size_t size, ssize_t (*action)(int fd, const void *, size_t))
{
- ssize_t nread;
- size_t size;
- off_t remaining;
+ size_t read_total = 0;
RESERVE_CONFIG_BUFFER(buffer,BUFSIZ);
- remaining = size = BUFSIZ;
- if (chunksize) {
- remaining = chunksize;
- }
+ while ((size == 0) || (read_total < size)) {
+ size_t read_try;
+ ssize_t read_actual;
- do {
- if (size > remaining) {
- size = remaining;
+ if ((size == 0) || (size - read_total > BUFSIZ)) {
+ read_try = BUFSIZ;
+ } else {
+ read_try = size - read_total;
}
- if ((nread = safe_read(fd1, buffer, size)) > 0) {
- if (bb_full_write(fd2, buffer, nread) < 0) {
+ read_actual = safe_read(src_fd, buffer, read_try);
+ if (read_actual > 0) {
+ if (action && (action(dst_fd, buffer, (size_t) read_actual) != read_actual)) {
bb_perror_msg(bb_msg_write_error); /* match Read error below */
break;
}
- if (chunksize && ((remaining -= nread) == 0)) {
- return 0;
- }
- } else if (!nread) {
- if (chunksize) {
+ }
+ else if (read_actual == 0) {
+ if (size) {
bb_error_msg("Unable to read all data");
- break;
}
- return 0;
- } else { /* nread < 0 */
- bb_perror_msg("Read error"); /* match bb_msg_write_error above */
+ break;
+ } else {
+ /* read_actual < 0 */
+ bb_perror_msg("Read error");
break;
}
- } while (1);
+ read_total += read_actual;
+ }
+
+ RELEASE_CONFIG_BUFFER(buffer);
- return -1;
+ return(read_total);
+}
+
+
+extern int bb_copyfd_size(int fd1, int fd2, const off_t size)
+{
+ return(bb_full_fd_action(fd1, fd2, size, bb_full_write));
+}
+
+extern int bb_copyfd_eof(int fd1, int fd2)
+{
+ return(bb_full_fd_action(fd1, fd2, 0, bb_full_write));
}
diff --git a/libbb/print_file.c b/libbb/print_file.c
index 6d3667b..161b398 100644
--- a/libbb/print_file.c
+++ b/libbb/print_file.c
@@ -28,7 +28,7 @@ extern void bb_xprint_and_close_file(FILE *file)
bb_xfflush_stdout();
/* Note: Do not use STDOUT_FILENO here, as this is a lib routine
* and the calling code may have reassigned stdout. */
- if (bb_copyfd(fileno(file), fileno(stdout), 0) == -1) {
+ if (bb_copyfd_eof(fileno(file), fileno(stdout)) == -1) {
/* bb_copyfd outputs any needed messages, so just die. */
exit(bb_default_error_retval);
}
diff --git a/networking/ftpgetput.c b/networking/ftpgetput.c
index 56223dc..2fd50e4 100644
--- a/networking/ftpgetput.c
+++ b/networking/ftpgetput.c
@@ -210,7 +210,7 @@ static int ftp_recieve(ftp_host_info_t *server, FILE *control_stream,
}
/* Copy the file */
- if (bb_copyfd(fd_data, fd_local, filesize) == -1) {
+ if (bb_copyfd_size(fd_data, fd_local, filesize) == -1) {
exit(EXIT_FAILURE);
}
@@ -272,7 +272,7 @@ static int ftp_send(ftp_host_info_t *server, FILE *control_stream,
}
/* transfer the file */
- if (bb_copyfd(fd_local, fd_data, 0) == -1) {
+ if (bb_copyfd_eof(fd_local, fd_data) == -1) {
exit(EXIT_FAILURE);
}