[BusyBox-cvs] busybox/libbb copy_file.c,1.22,1.23 copyfd.c,1.3,1.4 print_file.c,1.4,1.5
Glenn McGrath
bug1 at busybox.net
Fri Dec 13 08:20:47 UTC 2002
Update of /var/cvs/busybox/libbb
In directory winder:/tmp/cvs-serv23731/libbb
Modified Files:
copy_file.c copyfd.c print_file.c
Log Message:
Merge copyfd and copy_file_chunk
Index: copy_file.c
===================================================================
RCS file: /var/cvs/busybox/libbb/copy_file.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- copy_file.c 17 Sep 2002 08:42:21 -0000 1.22
+++ copy_file.c 13 Dec 2002 08:20:43 -0000 1.23
@@ -183,7 +183,7 @@
}
}
- if (copy_file_chunk(sfp, dfp, -1) < 0)
+ if (copyfd(fileno(sfp), fileno(dfp), 0) == -1)
status = -1;
if (fclose(dfp) < 0) {
Index: copyfd.c
===================================================================
RCS file: /var/cvs/busybox/libbb/copyfd.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- copyfd.c 24 Oct 2001 04:59:38 -0000 1.3
+++ copyfd.c 13 Dec 2002 08:20:43 -0000 1.4
@@ -24,27 +24,54 @@
#include <errno.h>
#include "libbb.h"
-
-extern int copyfd(int fd1, int fd2)
+/* If chunksize is 0 copy untill EOF */
+extern int copyfd(int fd1, int fd2, const off_t chunksize)
{
- char buf[8192];
- ssize_t nread, nwrote;
+ size_t nread;
+ size_t nwritten;
+ size_t size;
+ size_t remaining;
+ char buffer[BUFSIZ];
+
+ if (chunksize) {
+ remaining = chunksize;
+ } else {
+ remaining = -1;
+ }
+
+ do {
+ if ((chunksize > BUFSIZ) || (chunksize == 0)) {
+ size = BUFSIZ;
+ } else {
+ size = chunksize;
+ }
+
+ nread = safe_read(fd1, buffer, size);
- while (1) {
- nread = safe_read(fd1, buf, sizeof(buf));
- if (nread == 0)
- break;
if (nread == -1) {
- perror_msg("read");
- return -1;
+ perror_msg("read failure");
+ return(-1);
+ }
+ else if (nread == 0) {
+ if (chunksize) {
+ error_msg("Unable to read all data");
+ return(-1);
+ } else {
+ return(0);
+ }
}
- nwrote = full_write(fd2, buf, nread);
- if (nwrote == -1) {
- perror_msg("write");
- return -1;
+ nwritten = full_write(fd2, buffer, nread);
+
+ if (nwritten != nread) {
+ error_msg("Unable to write all data");
+ return(-1);
}
- }
+
+ if (chunksize) {
+ remaining -= nwritten;
+ }
+ } while (remaining != 0);
return 0;
}
Index: print_file.c
===================================================================
RCS file: /var/cvs/busybox/libbb/print_file.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- print_file.c 24 Oct 2001 04:59:38 -0000 1.4
+++ print_file.c 13 Dec 2002 08:20:43 -0000 1.5
@@ -20,6 +20,7 @@
*/
#include <stdio.h>
+#include <stdlib.h>
#include <sys/stat.h>
#include "libbb.h"
@@ -27,7 +28,9 @@
extern void print_file(FILE *file)
{
fflush(stdout);
- copyfd(fileno(file), fileno(stdout));
+ if (copyfd(fileno(file), fileno(stdout), 0) == -1) {
+ exit(EXIT_FAILURE);
+ }
fclose(file);
}
More information about the busybox-cvs
mailing list