[BusyBox-cvs] busybox/networking ftpgetput.c,1.8,1.9

Glenn McGrath bug1 at busybox.net
Fri Nov 21 22:25:01 UTC 2003


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

Modified Files:
	ftpgetput.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: ftpgetput.c
===================================================================
RCS file: /var/cvs/busybox/networking/ftpgetput.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- ftpgetput.c	3 Nov 2003 21:20:15 -0000	1.8
+++ ftpgetput.c	21 Nov 2003 22:24:57 -0000	1.9
@@ -210,7 +210,7 @@
 	}
 
 	/* 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 @@
 	}
 
 	/* transfer the file  */
-	if (bb_copyfd(fd_local, fd_data, 0) == -1) {
+	if (bb_copyfd_eof(fd_local, fd_data) == -1) {
 		exit(EXIT_FAILURE);
 	}
 




More information about the busybox-cvs mailing list