[Midnightbsd-cvs] src [10804] trunk/usr.sbin/extattrctl/extattrctl.c: sync

[laffer1 at midnightbsd.org]

Revision: 10804
          http://svnweb.midnightbsd.org/src/?rev=10804
Author:   laffer1
Date:     2018-06-09 23:16:00 -0400 (Sat, 09 Jun 2018)
Log Message:
-----------
sync

Modified Paths:
--------------
    trunk/usr.sbin/extattrctl/extattrctl.c

Modified: trunk/usr.sbin/extattrctl/extattrctl.c
===================================================================
--- trunk/usr.sbin/extattrctl/extattrctl.c	2018-06-10 03:15:36 UTC (rev 10803)
+++ trunk/usr.sbin/extattrctl/extattrctl.c	2018-06-10 03:16:00 UTC (rev 10804)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*-
  * Copyright (c) 1999-2002 Robert N. M. Watson
  * All rights reserved.
@@ -25,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/usr.sbin/extattrctl/extattrctl.c,v 1.19 2002/04/19 01:42:55 rwatson Exp $
+ * $FreeBSD: stable/10/usr.sbin/extattrctl/extattrctl.c 216292 2010-12-08 10:27:07Z kevlo $
  */
 /*
  * Developed by the TrustedBSD Project.
@@ -54,7 +55,7 @@
 void usage(void);
 
 void
-usage()
+usage(void)
 {
 
 	fprintf(stderr,
@@ -144,9 +145,11 @@
 	if (error == -1) {
 		perror(argv[1]);
 		unlink(argv[1]);
+		close(i);
 		return (-1);
 	}
 
+	close(i);
 	return (0);
 }
 
@@ -168,15 +171,18 @@
 	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);
 	}
 
@@ -183,6 +189,7 @@
 	printf("%s: version %d, size %d\n", argv[0], uef.uef_version,
 	    uef.uef_size);
 
+	close(fd);
 	return (0);
 }