Try to make indent formatting less horrible

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

diff --git a/libbb/full_read.c b/libbb/full_read.c
index e9c4bbfc6e45b63a7bb451fd04a4645e6d5ae72e..f4b332dcafb0db16f1874b26b64d49aafa83f56d 100644 (file)
--- a/libbb/full_read.c
+++ b/libbb/full_read.c
@@ -2,9 +2,7 @@
 /*
  * Utility routines.
  *
- * Copyright (C) tons of folks.  Tracking down who wrote what
- * isn't something I'm going to worry about...  If you wrote something
- * here, please feel free to acknowledge your work.
+ * Copyright (C) 1999-2003 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
@@ -19,40 +17,35 @@
  * 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
- *
- * Based in part on code from sash, Copyright (c) 1999 by David I. Bell 
- * Permission has been granted to redistribute this code under the GPL.
- *
  */
 
 #include <stdio.h>
 #include <unistd.h>
 #include "libbb.h"
 
-
 /*
  * Read all of the supplied buffer from a file.
  * This does multiple reads as necessary.
  * Returns the amount read, or -1 on an error.
  * A short read is returned on an end of file.
  */
-int full_read(int fd, char *buf, int len)
+ssize_t bb_full_read(int fd, void *buf, size_t len)
 {
-       int cc;
-       int total;
+       ssize_t cc;
+       ssize_t total;
 
        total = 0;
 
        while (len > 0) {
-               cc = read(fd, buf, len);
+               cc = safe_read(fd, buf, len);
 
                if (cc < 0)
-                       return -1;
+                       return cc;      /* read() returns -1 on failure. */
 
                if (cc == 0)
                        break;
 
-               buf += cc;
+               buf = ((char *)buf) + cc;
                total += cc;
                len -= cc;
        }