[BusyBox-cvs] busybox/archival/libunarchive Makefile.in, 1.20, 1.21 archive_xread_all.c, 1.2, 1.3 archive_xread_all_eof.c, 1.2, 1.3 data_extract_all.c, 1.15, 1.16 data_extract_to_stdout.c, 1.2, 1.3 get_header_tar.c, 1.28, 1.29 seek_by_char.c, 1.2, 1.3 archive_copy_file.c, 1.4, NONE archive_xread.c, 1.4, NONE

[Glenn McGrath]

Update of /var/cvs/busybox/archival/libunarchive
In directory winder:/tmp/cvs-serv3728/archival/libunarchive

Modified Files:
	Makefile.in archive_xread_all.c archive_xread_all_eof.c 
	data_extract_all.c data_extract_to_stdout.c get_header_tar.c 
	seek_by_char.c 
Removed Files:
	archive_copy_file.c archive_xread.c 
Log Message:
As we no longer use function pointers for read in common archiving code 
archive_xread can be replaced with bb_full_read, and archive_copy_file 
with bb_copyfd*
bb_copyfd is split into two functions bb_copyfd_size and bb_copyfd_eof, 
they share a common backend.


Index: Makefile.in
===================================================================
RCS file: /var/cvs/busybox/archival/libunarchive/Makefile.in,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- Makefile.in	20 Nov 2003 22:36:54 -0000	1.20
+++ Makefile.in	21 Nov 2003 22:24:48 -0000	1.21
@@ -37,15 +37,12 @@
 	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 \

Index: get_header_tar.c
===================================================================
RCS file: /var/cvs/busybox/archival/libunarchive/get_header_tar.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- get_header_tar.c	20 Nov 2003 10:47:06 -0000	1.28
+++ get_header_tar.c	21 Nov 2003 22:24:48 -0000	1.29
@@ -57,7 +57,7 @@
 	/* 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);
 	}

Index: data_extract_to_stdout.c
===================================================================
RCS file: /var/cvs/busybox/archival/libunarchive/data_extract_to_stdout.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- data_extract_to_stdout.c	3 Nov 2002 14:05:08 -0000	1.2
+++ data_extract_to_stdout.c	21 Nov 2003 22:24:48 -0000	1.3
@@ -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));
 }

Index: archive_xread_all_eof.c
===================================================================
RCS file: /var/cvs/busybox/archival/libunarchive/archive_xread_all_eof.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- archive_xread_all_eof.c	19 Mar 2003 09:11:25 -0000	1.2
+++ archive_xread_all_eof.c	21 Nov 2003 22:24:48 -0000	1.3
@@ -24,7 +24,7 @@
 {
 	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);
 	}

--- archive_copy_file.c DELETED ---

--- archive_xread.c DELETED ---

Index: data_extract_all.c
===================================================================
RCS file: /var/cvs/busybox/archival/libunarchive/data_extract_all.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- data_extract_all.c	20 Nov 2003 08:00:38 -0000	1.15
+++ data_extract_all.c	21 Nov 2003 22:24:48 -0000	1.16
@@ -79,7 +79,7 @@
 			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;
 				}

Index: seek_by_char.c
===================================================================
RCS file: /var/cvs/busybox/archival/libunarchive/seek_by_char.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- seek_by_char.c	14 Nov 2003 08:26:25 -0000	1.2
+++ seek_by_char.c	21 Nov 2003 22:24:48 -0000	1.3
@@ -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);
 }

Index: archive_xread_all.c
===================================================================
RCS file: /var/cvs/busybox/archival/libunarchive/archive_xread_all.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- archive_xread_all.c	19 Mar 2003 09:11:25 -0000	1.2
+++ archive_xread_all.c	21 Nov 2003 22:24:48 -0000	1.3
@@ -24,7 +24,7 @@
 {
 	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");
 	}