 @@ -1,14 +1,14 @@
-/*	$NetBSD: extattr.c,v 1.4 2012/03/13 21:13:34 christos Exp $	*/
+/*	$NetBSD: extattr.c,v 1.5 2017/03/09 11:39:41 maya Exp $	*/
 /*-
  * Copyright (c) 2001 Robert N. M. Watson
  * All rights reserved.
+ *
  * 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
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -22,27 +22,27 @@
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * 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.
  */
 /*
  * TrustedBSD: Utility functions for extended attributes.
  */
 #include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: extattr.c,v 1.4 2012/03/13 21:13:34 christos Exp $");
+__RCSID("$NetBSD: extattr.c,v 1.5 2017/03/09 11:39:41 maya Exp $");
 #endif /* LIBC_SCCS and not lint */
 #include "namespace.h"
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/extattr.h>
 #include <errno.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <string.h>
 const int extattr_namespaces[] = {
 @@ -140,42 +140,39 @@ extattr_copy_fd(int from_fd, int to_fd,
 		aname[alen] = '\0';
 		vlen = extattr_get_fd(from_fd, namespace, aname, NULL, 0);
 		if (vlen == -1)
 			goto out;
 		if (vlen > maxvlen) {
 			if ((aval = realloc(aval, (size_t)vlen)) == NULL)
 				goto out;
 			maxvlen = vlen;
+		}
 		if ((vlen = extattr_get_fd(from_fd, namespace, aname,
-				      aval, (size_t)vlen)) == -1)
+					   aval, (size_t)vlen)) == -1)
 			goto out;
 		if (extattr_set_fd(to_fd, namespace, aname,
 				   aval, (size_t)vlen) != vlen)
 			goto out;
+	}
 	error = 0;
 out:
-	if (aval != NULL)
+	free(aval);
-		free(aval);
+	free(alist);
 	if (alist != NULL)
 		free(alist);
 	return error;
+}
 int
 extattr_copy_file(const char *from, const char *to, int namespace)
+{
 	ssize_t llen, vlen, maxvlen;
 	size_t alen;
 	void *alist = NULL;
 	void *aval = NULL;
 	size_t i;
 	int error = -1;
 @@ -212,42 +209,40 @@ extattr_copy_file(const char *from, cons
 		(void)memcpy(aname, ap, alen);
 		aname[alen] = '\0';
 		vlen = extattr_get_file(from, namespace, aname, NULL, 0);
 		if (vlen == -1)
 			goto out;
 		if (vlen > maxvlen) {
 			if ((aval = realloc(aval, (size_t)vlen)) == NULL)
 				goto out;
 			maxvlen = vlen;
+		}
-		if ((vlen = extattr_get_file(from, namespace, aname,							     aval, (size_t)vlen)) == -1)
+		if ((vlen = extattr_get_file(from, namespace, aname,
 						aval, (size_t)vlen)) == -1)
 			goto out;
 		if (extattr_set_file(to, namespace, aname,
 				     aval, (size_t)vlen) != vlen)
 			goto out;
+	}
 	error = 0;
 out:
-	if (aval != NULL)
+	free(aval);
-		free(aval);
+	free(alist);
 	if (alist != NULL)
 		free(alist);
 	return error;
+}
 int
 extattr_copy_link(const char *from, const char *to, int namespace)
+{
 	ssize_t llen, vlen, maxvlen;
 	size_t alen;
 	void *alist = NULL;
 	void *aval = NULL;
 	size_t i;
 	int error = -1;
 @@ -295,32 +290,29 @@ extattr_copy_link(const char *from, cons
+		}
 		if ((vlen = extattr_get_link(from, namespace, aname,
 					     aval, (size_t)vlen)) == -1)
 			goto out;
 		if (extattr_set_link(to, namespace, aname,
 				     aval, (size_t)vlen) != vlen)
 			goto out;
+	}
 	error = 0;
 out:
-	if (aval != NULL)
+	free(aval);
-		free(aval);
+	free(alist);
 	if (alist != NULL)
 		free(alist);
 	return error;
+}
 static int
 extattr_namespace_access(int namespace, int mode)
+{
 	switch (namespace) {
 	case EXTATTR_NAMESPACE_SYSTEM:
 		if ((mode & (R_OK|W_OK)) && getuid() != 0)
 			return -1;
 		break;
 	default:
 		break;