From owner-svn-src-user@FreeBSD.ORG  Wed May  7 20:50:17 2014
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 1F85CCD0;
 Wed,  7 May 2014 20:50:17 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 0D168CAA;
 Wed,  7 May 2014 20:50:17 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s47KoGcc080621;
 Wed, 7 May 2014 20:50:16 GMT (envelope-from marcel@svn.freebsd.org)
Received: (from marcel@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s47KoGuM080620;
 Wed, 7 May 2014 20:50:16 GMT (envelope-from marcel@svn.freebsd.org)
Message-Id: <201405072050.s47KoGuM080620@svn.freebsd.org>
From: Marcel Moolenaar <marcel@FreeBSD.org>
Date: Wed, 7 May 2014 20:50:16 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r265609 - user/marcel/mkimg
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
 src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 07 May 2014 20:50:17 -0000

Author: marcel
Date: Wed May  7 20:50:16 2014
New Revision: 265609
URL: http://svnweb.freebsd.org/changeset/base/265609

Log:
  Replace 2 instances of fdcopy() with image_copyin(). With this, the
  mkimg() function does not need the ofd argument and all references
  to an output file descriptor in the input phase are gone.

Modified:
  user/marcel/mkimg/mkimg.c

Modified: user/marcel/mkimg/mkimg.c
==============================================================================
--- user/marcel/mkimg/mkimg.c	Wed May  7 20:40:23 2014	(r265608)
+++ user/marcel/mkimg/mkimg.c	Wed May  7 20:50:16 2014	(r265609)
@@ -318,7 +318,7 @@ fdcopy(int src, lba_t sblk, int dst, lba
 }
 
 static void
-mkimg(int ofd, int bfd)
+mkimg(int bfd)
 {
 	FILE *fp;
 	struct part *part;
@@ -352,7 +352,7 @@ mkimg(int ofd, int bfd)
 		case PART_KIND_FILE:
 			fd = open(part->contents, O_RDONLY, 0);
 			if (fd != -1) {
-				error = fdcopy(fd, -1, ofd, block, &bytesize);
+				error = image_copyin(block, fd, &bytesize);
 				close(fd);
 			} else
 				error = errno;
@@ -361,7 +361,7 @@ mkimg(int ofd, int bfd)
 			fp = popen(part->contents, "r");
 			if (fp != NULL) {
 				fd = fileno(fp);
-				error = fdcopy(fd, -1, ofd, block, &bytesize);
+				error = image_copyin(block, fd, &bytesize);
 				pclose(fp);
 			} else
 				error = errno;
@@ -488,7 +488,7 @@ main(int argc, char *argv[])
 		fprintf(stderr, "Number of heads:     %u\n", nheads);
 	}
 
-	mkimg(tmpfd, bcfd);
+	mkimg(bcfd);
 
 	if (verbose)
 		fprintf(stderr, "Number of cylinders: %u\n", ncyls);