X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Ffull-write.c;h=b8036772d271d43cd61697d339d46e8d06cee595;hb=46f5f314f34a08c9305758482d7d2fdb0e999d09;hp=151370563780d939b77f4f35144575b259a2cfe1;hpb=9516d965cd7ae4364d6b68ae85b35025e7702c50;p=gnulib.git
diff --git a/lib/full-write.c b/lib/full-write.c
index 151370563..b8036772d 100644
--- a/lib/full-write.c
+++ b/lib/full-write.c
@@ -1,11 +1,11 @@
/* An interface to read and write that retries (if necessary) until complete.
- Copyright (C) 1993, 1994, 1997-2003 Free Software Foundation, Inc.
+ Copyright (C) 1993-1994, 1997-2006, 2009-2014 Free Software Foundation, Inc.
- This program is free software; you can redistribute it and/or modify
+ 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, or (at your option)
- any later version.
+ the Free Software Foundation; either version 3 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
@@ -13,12 +13,9 @@
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. */
+ along with this program. If not, see . */
-#if HAVE_CONFIG_H
-# include
-#endif
+#include
/* Specification. */
#ifdef FULL_READ
@@ -28,9 +25,6 @@
#endif
#include
-#ifndef errno
-extern int errno;
-#endif
#ifdef FULL_READ
# include "safe-read.h"
@@ -64,18 +58,18 @@ size_t
full_rw (int fd, const void *buf, size_t count)
{
size_t total = 0;
- const char *ptr = buf;
+ const char *ptr = (const char *) buf;
while (count > 0)
{
size_t n_rw = safe_rw (fd, ptr, count);
if (n_rw == (size_t) -1)
- break;
+ break;
if (n_rw == 0)
- {
- errno = ZERO_BYTE_TRANSFER_ERRNO;
- break;
- }
+ {
+ errno = ZERO_BYTE_TRANSFER_ERRNO;
+ break;
+ }
total += n_rw;
ptr += n_rw;
count -= n_rw;