From owner-svn-src-head@FreeBSD.ORG  Wed Dec  1 08:07:32 2010
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8CD4A10656A3;
	Wed,  1 Dec 2010 08:07:32 +0000 (UTC)
	(envelope-from kevlo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 7B5618FC19;
	Wed,  1 Dec 2010 08:07:32 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id oB187W5r085315;
	Wed, 1 Dec 2010 08:07:32 GMT (envelope-from kevlo@svn.freebsd.org)
Received: (from kevlo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id oB187WPN085313;
	Wed, 1 Dec 2010 08:07:32 GMT (envelope-from kevlo@svn.freebsd.org)
Message-Id: <201012010807.oB187WPN085313@svn.freebsd.org>
From: Kevin Lo <kevlo@FreeBSD.org>
Date: Wed, 1 Dec 2010 08:07:32 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r216095 - head/sbin/bsdlabel
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 01 Dec 2010 08:07:32 -0000

Author: kevlo
Date: Wed Dec  1 08:07:32 2010
New Revision: 216095
URL: http://svn.freebsd.org/changeset/base/216095

Log:
  Closing file descriptors when it's done

Modified:
  head/sbin/bsdlabel/bsdlabel.c

Modified: head/sbin/bsdlabel/bsdlabel.c
==============================================================================
--- head/sbin/bsdlabel/bsdlabel.c	Wed Dec  1 05:52:27 2010	(r216094)
+++ head/sbin/bsdlabel/bsdlabel.c	Wed Dec  1 08:07:32 2010	(r216095)
@@ -370,10 +370,12 @@ readboot(void)
 		p[60] = (st.st_size + secsize - 1) / secsize;
 		p[61] = 1;
 		p[62] = 0;
+		close(fd);
 		return;
 	} else if ((!alphacksum) && st.st_size <= BBSIZE) {
 		if (read(fd, bootarea, st.st_size) != st.st_size)
 			err(1, "read error %s", xxboot);
+		close(fd);
 		return;
 	}
 	errx(1, "boot code %s is wrong size", xxboot);