svn commit: r340500 - stable/12/bin/getfacl

[Mark Johnston]

Author: markj
Date: Sat Nov 17 18:53:28 2018
New Revision: 340500
URL: https://svnweb.freebsd.org/changeset/base/340500

Log:
  MFC r340014:
  Avoid copying a struct stat for acl_from_stat() calls.

Modified:
  stable/12/bin/getfacl/getfacl.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/bin/getfacl/getfacl.c
==============================================================================
--- stable/12/bin/getfacl/getfacl.c	Sat Nov 17 18:51:22 2018	(r340499)
+++ stable/12/bin/getfacl/getfacl.c	Sat Nov 17 18:53:28 2018	(r340500)
@@ -88,7 +88,7 @@ getgname(gid_t gid)
  * contained in struct stat
  */
 static acl_t
-acl_from_stat(struct stat sb)
+acl_from_stat(const struct stat *sb)
 {
 	acl_t acl;
 	acl_entry_t entry;
@@ -111,13 +111,13 @@ acl_from_stat(struct stat sb)
 		return NULL;
 
 	/* calculate user mode */
-	if (sb.st_mode & S_IRUSR)
+	if (sb->st_mode & S_IRUSR)
 		if (acl_add_perm(perms, ACL_READ) == -1)
 			return NULL;
-	if (sb.st_mode & S_IWUSR)
+	if (sb->st_mode & S_IWUSR)
 		if (acl_add_perm(perms, ACL_WRITE) == -1)
 			return NULL;
-	if (sb.st_mode & S_IXUSR)
+	if (sb->st_mode & S_IXUSR)
 		if (acl_add_perm(perms, ACL_EXECUTE) == -1)
 			return NULL;
 	if (acl_set_permset(entry, perms) == -1)
@@ -135,13 +135,13 @@ acl_from_stat(struct stat sb)
 		return NULL;
 
 	/* calculate group mode */
-	if (sb.st_mode & S_IRGRP)
+	if (sb->st_mode & S_IRGRP)
 		if (acl_add_perm(perms, ACL_READ) == -1)
 			return NULL;
-	if (sb.st_mode & S_IWGRP)
+	if (sb->st_mode & S_IWGRP)
 		if (acl_add_perm(perms, ACL_WRITE) == -1)
 			return NULL;
-	if (sb.st_mode & S_IXGRP)
+	if (sb->st_mode & S_IXGRP)
 		if (acl_add_perm(perms, ACL_EXECUTE) == -1)
 			return NULL;
 	if (acl_set_permset(entry, perms) == -1)
@@ -159,13 +159,13 @@ acl_from_stat(struct stat sb)
 		return NULL;
 
 	/* calculate other mode */
-	if (sb.st_mode & S_IROTH)
+	if (sb->st_mode & S_IROTH)
 		if (acl_add_perm(perms, ACL_READ) == -1)
 			return NULL;
-	if (sb.st_mode & S_IWOTH)
+	if (sb->st_mode & S_IWOTH)
 		if (acl_add_perm(perms, ACL_WRITE) == -1)
 			return NULL;
-	if (sb.st_mode & S_IXOTH)
+	if (sb->st_mode & S_IXOTH)
 		if (acl_add_perm(perms, ACL_EXECUTE) == -1)
 			return NULL;
 	if (acl_set_permset(entry, perms) == -1)
@@ -229,7 +229,7 @@ print_acl(char *path, acl_type_t type, int hflag, int 
 		errno = 0;
 		if (type == ACL_TYPE_DEFAULT)
 			return(0);
-		acl = acl_from_stat(sb);
+		acl = acl_from_stat(&sb);
 		if (!acl) {
 			warn("%s: acl_from_stat() failed", path);
 			return(-1);