From owner-svn-src-all@FreeBSD.ORG  Wed Dec  8 10:27:08 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 00B641065670;
	Wed,  8 Dec 2010 10:27:08 +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 E45888FC0C;
	Wed,  8 Dec 2010 10:27:07 +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 oB8AR7OC097976;
	Wed, 8 Dec 2010 10:27:07 GMT (envelope-from kevlo@svn.freebsd.org)
Received: (from kevlo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id oB8AR7bj097974;
	Wed, 8 Dec 2010 10:27:07 GMT (envelope-from kevlo@svn.freebsd.org)
Message-Id: <201012081027.oB8AR7bj097974@svn.freebsd.org>
From: Kevin Lo <kevlo@FreeBSD.org>
Date: Wed, 8 Dec 2010 10:27:07 +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: r216292 - head/usr.sbin/extattrctl
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 08 Dec 2010 10:27:08 -0000

Author: kevlo
Date: Wed Dec  8 10:27:07 2010
New Revision: 216292
URL: http://svn.freebsd.org/changeset/base/216292

Log:
  Close fd in initattr() and showattr().
  
  Reviewed by:	rwatson

Modified:
  head/usr.sbin/extattrctl/extattrctl.c

Modified: head/usr.sbin/extattrctl/extattrctl.c
==============================================================================
--- head/usr.sbin/extattrctl/extattrctl.c	Wed Dec  8 08:57:37 2010	(r216291)
+++ head/usr.sbin/extattrctl/extattrctl.c	Wed Dec  8 10:27:07 2010	(r216292)
@@ -144,9 +144,11 @@ initattr(int argc, char *argv[])
 	if (error == -1) {
 		perror(argv[1]);
 		unlink(argv[1]);
+		close(i);
 		return (-1);
 	}
 
+	close(i);
 	return (0);
 }
 
@@ -168,21 +170,25 @@ showattr(int argc, char *argv[])
 	i = read(fd, &uef, sizeof(uef));
 	if (i == -1) {
 		perror(argv[0]);
+		close(fd);
 		return (-1);
 	}
 	if (i != sizeof(uef)) {
 		fprintf(stderr, "%s: invalid file header\n", argv[0]);
+		close(fd);
 		return (-1);
 	}
 
 	if (uef.uef_magic != UFS_EXTATTR_MAGIC) {
 		fprintf(stderr, "%s: bad magic\n", argv[0]);
+		close(fd);
 		return (-1);
 	}
 
 	printf("%s: version %d, size %d\n", argv[0], uef.uef_version,
 	    uef.uef_size);
 
+	close(fd);
 	return (0);
 }