/*
* Utility routines.
*
- * Copyright (C) 1999-2001 Erik Andersen <andersee@debian.org>
+ * Copyright (C) 1999-2005 by Erik Andersen <andersen@codepoet.org>
*
* 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
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <unistd.h>
-#include <string.h>
#include <errno.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include "busybox.h"
#include "libbb.h"
-extern int copyfd(int fd1, int fd2)
+#if BUFSIZ < 4096
+#undef BUFSIZ
+#define BUFSIZ 4096
+#endif
+
+
+static size_t bb_full_fd_action(int src_fd, int dst_fd, const size_t size2)
{
- char buf[8192];
- ssize_t nread, nwrote;
-
- while (1) {
- nread = safe_read(fd1, buf, sizeof(buf));
- if (nread == 0)
- break;
- if (nread == -1) {
- perror_msg("read");
- return -1;
- }
+ int status;
+ size_t xread, wrote, total, size = size2;
+
+ if ((dst_fd < 0) || (src_fd < 0)) {
+ return -1;
+ }
- nwrote = full_write(fd2, buf, nread);
- if (nwrote == -1) {
- perror_msg("write");
- return -1;
+ if (size == 0) {
+ /* If size is 0 copy until EOF */
+ size = ULONG_MAX;
+ }
+
+ {
+ RESERVE_CONFIG_BUFFER(buffer,BUFSIZ);
+ total = 0;
+ wrote = 0;
+ status = -1;
+ while (total < size)
+ {
+ xread = BUFSIZ;
+ if (size < (wrote + BUFSIZ))
+ xread = size - wrote;
+ xread = bb_full_read(src_fd, buffer, xread);
+ if (xread > 0) {
+ wrote = bb_full_write(dst_fd, buffer, xread);
+ if (wrote < xread) {
+ bb_perror_msg(bb_msg_write_error);
+ break;
+ }
+ total += wrote;
+ } else if (xread < 0) {
+ bb_perror_msg(bb_msg_read_error);
+ break;
+ } else if (xread == 0) {
+ /* All done. */
+ status = 0;
+ break;
+ }
}
+ RELEASE_CONFIG_BUFFER(buffer);
}
- return 0;
+ if (status == 0 || wrote)
+ return wrote;
+ /* Some sortof error occured */
+ return -1;
}
-/* END CODE */
-/*
-Local Variables:
-c-file-style: "linux"
-c-basic-offset: 4
-tab-width: 4
-End:
-*/
+
+extern int bb_copyfd_size(int fd1, int fd2, const off_t size)
+{
+ if (size) {
+ return(bb_full_fd_action(fd1, fd2, size));
+ }
+ return(0);
+}
+
+extern int bb_copyfd_eof(int fd1, int fd2)
+{
+ return(bb_full_fd_action(fd1, fd2, 0));
+}