Allow a user-configurable minimum password length.

[oweals/busybox.git] / libbb / copyfd.c

diff --git a/libbb/copyfd.c b/libbb/copyfd.c
index aa938d1053e17c32bd842ab5443c51eb28fe4d9f..e2c542e321c0951144aa7aa9037dbd7e6868d628 100644 (file)
--- a/libbb/copyfd.c
+++ b/libbb/copyfd.c
@@ -2,58 +2,74 @@
 /*
  * 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
- * 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
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
-#include <unistd.h>
-#include <string.h>
 #include <errno.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
 #include "libbb.h"
 
 
-extern int copyfd(int fd1, int fd2)
+#if BUFSIZ < 4096
+#undef BUFSIZ
+#define BUFSIZ 4096
+#endif
+
+
+static ssize_t bb_full_fd_action(int src_fd, int dst_fd, size_t size)
 {
-       char buf[8192];
-       ssize_t nread, nwrote;
+       int status = -1;
+       size_t total = 0;
+       RESERVE_CONFIG_BUFFER(buffer,BUFSIZ);
 
-       while (1) {
-               nread = safe_read(fd1, buf, sizeof(buf));
-               if (nread == 0)
-                       break;
-               if (nread == -1) {
-                       perror_msg("read");
-                       return -1;
-               }
+       if (src_fd < 0) goto out;
+       while (!size || total < size)
+       {
+               ssize_t wrote, xread;
+
+               xread = safe_read(src_fd, buffer,
+                               (!size || size - total > BUFSIZ) ? BUFSIZ : size - total);
 
-               nwrote = full_write(fd2, buf, nread);
-               if (nwrote == -1) {
-                       perror_msg("write");
-                       return -1;
+               if (xread > 0) {
+                       /* A -1 dst_fd means we need to fake it... */
+                       wrote = (dst_fd < 0) ? xread : bb_full_write(dst_fd, buffer, xread);
+                       if (wrote < xread) {
+                               bb_perror_msg(bb_msg_write_error);
+                               break;
+                       }
+                       total += wrote;
+                       if (total == size) status = 0;
+               } else if (xread < 0) {
+                       bb_perror_msg(bb_msg_read_error);
+                       break;
+               } else if (xread == 0) {
+                       /* All done. */
+                       status = 0;
+                       break;
                }
        }
 
-       return 0;
+out:
+       RELEASE_CONFIG_BUFFER(buffer);
+
+       return status ? status : (ssize_t)total;
 }
 
-/* END CODE */
-/*
-Local Variables:
-c-file-style: "linux"
-c-basic-offset: 4
-tab-width: 4
-End:
-*/
+
+int bb_copyfd_size(int fd1, int fd2, const off_t size)
+{
+       if (size) {
+               return(bb_full_fd_action(fd1, fd2, size));
+       }
+       return(0);
+}
+
+int bb_copyfd_eof(int fd1, int fd2)
+{
+       return(bb_full_fd_action(fd1, fd2, 0));
+}