diff options
| author | peter <peter@FreeBSD.org> | 2008-07-10 02:08:00 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 2008-07-10 02:08:00 +0000 |
| commit | 5fd3bac82eb9e3ba73a8a18d9badc977aef7f6e5 (patch) | |
| tree | c560fe69f2037481cd1e0ead005853b2b18de0bd /contrib/cpio/lib/full-write.c | |
| parent | b07b40d7feb6ae8e188fa82622c29d6a0daeb94e (diff) | |
| parent | 6ae22f7302b696d7694ae041817a4744a1476523 (diff) | |
| download | FreeBSD-src-5fd3bac82eb9e3ba73a8a18d9badc977aef7f6e5.zip FreeBSD-src-5fd3bac82eb9e3ba73a8a18d9badc977aef7f6e5.tar.gz | |
Merge gnu cpio 2.6 -> 2.8 changes. Unfortunately, we have massive
conflicts due to radically different approaches to security and bug fixes.
In some cases I re-started from the vendor version and reimplemented our
patches. Fortunately, this is not enabled by default in -current.
Diffstat (limited to 'contrib/cpio/lib/full-write.c')
| -rw-r--r-- | contrib/cpio/lib/full-write.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/contrib/cpio/lib/full-write.c b/contrib/cpio/lib/full-write.c index d119977..cc16872 100644 --- a/contrib/cpio/lib/full-write.c +++ b/contrib/cpio/lib/full-write.c @@ -1,7 +1,7 @@ /* An interface to read and write that retries (if necessary) until complete. Copyright (C) 1993, 1994, 1997, 1998, 1999, 2000, 2001, 2002, 2003, - 2004 Free Software Foundation, Inc. + 2004, 2005, 2006 Free Software Foundation, Inc. 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 @@ -15,11 +15,9 @@ 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. */ + Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#if HAVE_CONFIG_H -# include <config.h> -#endif +#include <config.h> /* Specification. */ #ifdef FULL_READ @@ -62,7 +60,7 @@ 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) { |
