 @@ -1,259 +1,258 @@
-/*	$NetBSD: fvwrite.c,v 1.28 2021/07/16 12:34:10 christos Exp $	*/
+/*	$NetBSD: fvwrite.c,v 1.29 2021/07/19 10:00:32 christos Exp $	*/
 /*-
  * Copyright (c) 1990, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Chris Torek.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
 #if 0
 static char sccsid[] = "@(#)fvwrite.c	8.1 (Berkeley) 6/4/93";
 #else
-__RCSID("$NetBSD: fvwrite.c,v 1.28 2021/07/16 12:34:10 christos Exp $");
+__RCSID("$NetBSD: fvwrite.c,v 1.29 2021/07/19 10:00:32 christos Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 #include <assert.h>
 #include <stddef.h>
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include "reentrant.h"
 #include "local.h"
 #include "fvwrite.h"
 static int
-flush_adj(FILE *fp, struct __suio *uio, struct __siov *iov, ssize_t w)
+flush_adj(FILE *fp, struct __suio *uio, ssize_t w)
+{
 	int rc;
 	_DIAGASSERT(w >= 0);
 	_DIAGASSERT(fp->_w >= 0);
 	if ((rc = fflush(fp)) == 0)
 		return 0;
 	/*
 	 * If we have to return without writing the whole buffer,
 	 * adjust for how much fflush() has written for us.
 	 * `w' is the amt. of new user data just copied into our
 	 * internal buffer in _this_ fwrite() call.
          */
 	if (fp->_w < w)	{
 		/* some new data was also written */
 		ssize_t i = w - fp->_w;
 		/* adjust amt. written */
 		uio->uio_resid -= i;
 		iov->iov_len -= i;
 	} else {
 		/* only old stuff was written */
 		/* adjust _p and _w so user can retry */
 		fp->_p -= w;
 		fp->_w += w;
+	}
 	return rc;
+}
 /*
  * Write some memory regions.  Return zero on success, EOF on error.
+ *
  * This routine is large and unsightly, but most of the ugliness due
  * to the three different kinds of output buffering is handled here.
  */
 int
 __sfvwrite(FILE *fp, struct __suio *uio)
+{
 	size_t len;
 	char *p;
 	struct __siov *iov;
 	int s;
 	ssize_t w;
 	char *nl;
 	size_t nlknown, nldist;
 	_DIAGASSERT(fp != NULL);
 	_DIAGASSERT(uio != NULL);
 	if ((ssize_t)uio->uio_resid < 0) {
 		errno = EINVAL;
 		return EOF;
+	}
 	if (uio->uio_resid == 0)
 		return 0;
 	/* make sure we can write */
 	if (cantwrite(fp)) {
 		errno = EBADF;
 		return EOF;
+	}
 #define	MIN(a, b) ((a) < (b) ? (a) : (b))
 #define	COPY(n)	  (void)memcpy(fp->_p, p, (size_t)(n))
 	iov = uio->uio_iov;
 	p = iov->iov_base;
 	len = iov->iov_len;
 	iov++;
 #define GETIOV(extra_work) \
 	while (len == 0) { \
 		extra_work; \
 		p = iov->iov_base; \
 		len = iov->iov_len; \
 		iov++; \
+	}
 #define WRITE(nw) \
 	w = (*fp->_write)(fp->_cookie, p, nw); \
 	if (w <= 0) \
 		goto err
 #define FLUSH(nw) \
-	if (flush_adj(fp, uio, iov - 1, nw)) \
+	if (flush_adj(fp, uio, nw)) \
 		goto err
 	if (fp->_flags & __SNBF) {
 		/*
 		 * Unbuffered: write up to BUFSIZ bytes at a time.
 		 */
 		do {
 			GETIOV(;);
 			WRITE(MIN(len, BUFSIZ));
 			p += w;
 			len -= w;
 		} while ((uio->uio_resid -= w) != 0);
 	} else if ((fp->_flags & __SLBF) == 0) {
 		/*
 		 * Fully buffered: fill partially full buffer, if any,
 		 * and then flush.  If there is no partial buffer, write
 		 * one _bf._size byte chunk directly (without copying).
+		 *
 		 * String output is a special case: write as many bytes
 		 * as fit, but pretend we wrote everything.  This makes
 		 * snprintf() return the number of bytes needed, rather
 		 * than the number used, and avoids its write function
 		 * (so that the write function can be invalid).
 		 */
 		do {
 			GETIOV(;);
 			if ((fp->_flags & (__SALC | __SSTR)) ==
 			    (__SALC | __SSTR) && (size_t)fp->_w < len) {
 				ptrdiff_t blen = fp->_p - fp->_bf._base;
 				unsigned char *_base;
 				int _size;
 				/* Allocate space exponentially. */
 				_size = fp->_bf._size;
 				do {
 					_size = (_size << 1) + 1;
 				} while ((size_t)_size < blen + len);
 				_base = realloc(fp->_bf._base,
 				    (size_t)(_size + 1));
 				if (_base == NULL)
 					goto err;
 				fp->_w += _size - fp->_bf._size;
 				fp->_bf._base = _base;
 				fp->_bf._size = _size;
 				fp->_p = _base + blen;
+			}
 			w = fp->_w;
 			if (fp->_flags & __SSTR) {
 				if (len < (size_t)w)
 					w = len;
 				COPY(w);	/* copy MIN(fp->_w,len), */
 				fp->_w -= (int)w;
 				fp->_p += w;
 				w = len;	/* but pretend copied all */
 			} else if (fp->_p > fp->_bf._base && len > (size_t)w) {
 				/* fill and flush */
 				COPY(w);
 				/* fp->_w -= w; */ /* unneeded */
 				fp->_p += w;
 				FLUSH(w);
 			} else if (len >= (size_t)(w = fp->_bf._size)) {
 				/* write directly */
 				WRITE((size_t)w);
 			} else {
 				/* fill and done */
 				w = len;
 				COPY(w);
 				fp->_w -= (int)w;
 				fp->_p += w;
+			}
 			p += w;
 			len -= w;
 		} while ((uio->uio_resid -= w) != 0);
 	} else {
 		/*
 		 * Line buffered: like fully buffered, but we
 		 * must check for newlines.  Compute the distance
 		 * to the first newline (including the newline),
 		 * or `infinity' if there is none, then pretend
 		 * that the amount to write is MIN(len,nldist).
 		 */
 		nlknown = 0;
 		nldist = 0;	/* XXX just to keep gcc happy */
 		do {
 			GETIOV(nlknown = 0);
 			if (!nlknown) {
 				nl = memchr(p, '\n', len);
 				nldist = nl ? (size_t)(nl + 1 - p) : len + 1;
 				nlknown = 1;
+			}
 			s = (int)MIN(len, nldist);
 			w = fp->_w + fp->_bf._size;
 			if (fp->_p > fp->_bf._base && s > w) {
 				COPY(w);
 				/* fp->_w -= w; */
 				fp->_p += w;
 				FLUSH(w);
 			} else if (s >= (w = fp->_bf._size)) {
 				WRITE((size_t)w);
 			} else {
 				w = s;
 				COPY(w);
 				fp->_w -= (int)w;
 				fp->_p += w;
+			}
 			if ((nldist -= w) == 0) {
 				/* copied the newline: flush and forget */
 				FLUSH(w);
 				nlknown = 0;
+			}
 			p += w;
 			len -= w;
 		} while ((uio->uio_resid -= w) != 0);
+	}
 	return 0;
 err:
 	fp->_flags |= __SERR;
 	return EOF;
+}