Thu Apr 16 18:54:16 2009 UTC ()

Distinguish read(2) failure due to a short read from other causes, and
suggest in the error message a possible cause: the size= attribute in
the metalog (if one is given) may be different from the source file's
actual size.


(dyoung)

diff -r1.42 -r1.43 src/usr.sbin/makefs/ffs.c

--- src/usr.sbin/makefs/ffs.c 2006/12/18 21:03:29	1.42
+++ src/usr.sbin/makefs/ffs.c 2009/04/16 18:54:16	1.43

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ffs.c,v 1.42 2006/12/18 21:03:29 christos Exp $	*/
+/*	$NetBSD: ffs.c,v 1.43 2009/04/16 18:54:16 dyoung Exp $	*/
 /*
  * Copyright (c) 2001 Wasabi Systems, Inc.
  * All rights reserved.
+ *
  * Written by Luke Mewburn for Wasabi Systems, Inc.
+ *
  * 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
 @@ -61,27 +61,27 @@
  * 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.
+ *
  *	@(#)ffs_alloc.c	8.19 (Berkeley) 7/13/95
  */
 #if HAVE_NBTOOL_CONFIG_H
 #include "nbtool_config.h"
 #endif
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(__lint)
-__RCSID("$NetBSD: ffs.c,v 1.42 2006/12/18 21:03:29 christos Exp $");
+__RCSID("$NetBSD: ffs.c,v 1.43 2009/04/16 18:54:16 dyoung Exp $");
 #endif	/* !__lint */
 #include <sys/param.h>
 #if !HAVE_NBTOOL_CONFIG_H
 #include <sys/mount.h>
 #endif
 #include <assert.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <stdarg.h>
 #include <stdio.h>
 @@ -835,26 +835,27 @@ ffs_populate_dir(const char *dir, fsnode
 		/* cleanup */
 	if (dirbuf.buf != NULL)
 		free(dirbuf.buf);
 	return (1);
+}
 static void
 ffs_write_file(union dinode *din, uint32_t ino, void *buf, fsinfo_t *fsopts)
+{
 	int 	isfile, ffd;
 	char	*fbuf, *p;
 	off_t	bufleft, chunk, offset;
 	ssize_t nread;
 	struct inode	in;
 	struct buf *	bp;
 	ffs_opt_t	*ffs_opts = fsopts->fs_specific;
 	assert (din != NULL);
 	assert (buf != NULL);
 	assert (fsopts != NULL);
 	assert (ffs_opts != NULL);
 	isfile = S_ISREG(DIP(din, mode));
 	fbuf = NULL;
 	ffd = -1;
 	p = NULL;
 @@ -889,32 +890,39 @@ ffs_write_file(union dinode *din, uint32
 		if ((fbuf = malloc(ffs_opts->bsize)) == NULL)
 			err(1, "Allocating memory for write buffer");
 		if ((ffd = open((char *)buf, O_RDONLY, 0444)) == -1) {
 			warn("Can't open `%s' for reading", (char *)buf);
 			goto leave_ffs_write_file;
+		}
 	} else {
 		p = buf;
+	}
 	chunk = 0;
 	for (bufleft = DIP(din, size); bufleft > 0; bufleft -= chunk) {
 		chunk = MIN(bufleft, ffs_opts->bsize);
-		if (isfile) {
+		if (!isfile)
 			if (read(ffd, fbuf, chunk) != chunk)
-				err(1, "Reading `%s', %lld bytes to go",
+		else if ((nread = read(ffd, fbuf, chunk)) == -1)
-				    (char *)buf, (long long)bufleft);
+			err(EXIT_FAILURE, "Reading `%s', %lld bytes to go",
 			    (char *)buf, (long long)bufleft);
 		else if (nread != chunk)
 			errx(EXIT_FAILURE, "Reading `%s', %lld bytes to go, "
 			    "read %zd bytes, expected %ju bytes, does "
 			    "metalog size= attribute mismatch source size?",
 			    (char *)buf, (long long)bufleft, nread,
 			    (uintmax_t)chunk);
 		else
 			p = fbuf;
 		offset = DIP(din, size) - bufleft;
 		if (debug & DEBUG_FS_WRITE_FILE_BLOCK)
 			printf(
 		"ffs_write_file: write %p offset %lld size %lld left %lld\n",
 			    p, (long long)offset,
 			    (long long)chunk, (long long)bufleft);
 	/*
 	 * XXX	if holey support is desired, do the check here
+	 *
 	 * XXX	might need to write out last bit in fragroundup
 	 *	sized chunk. however, ffs_balloc() handles this for us
 	 */
 		errno = ffs_balloc(&in, offset, chunk, &bp);