d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bin/setfacl: Little refactoring, no functional change.

Browse Source 
The acl_from_stat function accepts a stat_t * argument, but only uses its
st_mode field. There is no reason to pass the whole struct, so make it accept
a mode_t and rename the function to acl_from_mode.
Linux has non-standard acl_from_mode function in its libacl, so naming the
function this way may help discovering it during porting efforts.

Reviewed by:	tsoome, markj
Approved by:	markj
Differential Revision:	https://reviews.freebsd.org/D27292
This commit is contained in:
Gleb Popov 2020-11-23 17:00:06 +00:00
parent 64cecc7a75
commit caeb270e9f
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
bin/getfacl/getfacl.c
View File

@ -85,10 +85,10 @@ getgname(gid_t gid)
/* /*
* return an ACL corresponding to the permissions * return an ACL corresponding to the permissions
* contained in struct stat * contained in mode_t
*/ */
static acl_t static acl_t
acl_from_stat(const struct stat *sb) acl_from_mode(const mode_t mode)
{ {
acl_t acl; acl_t acl;
acl_entry_t entry; acl_entry_t entry;
@ -111,13 +111,13 @@ acl_from_stat(const struct stat *sb)
return NULL; return NULL;
/* calculate user mode */ /* calculate user mode */
if (sb->st_mode & S_IRUSR) if (mode & S_IRUSR)
if (acl_add_perm(perms, ACL_READ) == -1) if (acl_add_perm(perms, ACL_READ) == -1)
return NULL; return NULL;
if (sb->st_mode & S_IWUSR) if (mode & S_IWUSR)
if (acl_add_perm(perms, ACL_WRITE) == -1) if (acl_add_perm(perms, ACL_WRITE) == -1)
return NULL; return NULL;
if (sb->st_mode & S_IXUSR) if (mode & S_IXUSR)
if (acl_add_perm(perms, ACL_EXECUTE) == -1) if (acl_add_perm(perms, ACL_EXECUTE) == -1)
return NULL; return NULL;
if (acl_set_permset(entry, perms) == -1) if (acl_set_permset(entry, perms) == -1)
@ -135,13 +135,13 @@ acl_from_stat(const struct stat *sb)
return NULL; return NULL;
/* calculate group mode */ /* calculate group mode */
if (sb->st_mode & S_IRGRP) if (mode & S_IRGRP)
if (acl_add_perm(perms, ACL_READ) == -1) if (acl_add_perm(perms, ACL_READ) == -1)
return NULL; return NULL;
if (sb->st_mode & S_IWGRP) if (mode & S_IWGRP)
if (acl_add_perm(perms, ACL_WRITE) == -1) if (acl_add_perm(perms, ACL_WRITE) == -1)
return NULL; return NULL;
if (sb->st_mode & S_IXGRP) if (mode & S_IXGRP)
if (acl_add_perm(perms, ACL_EXECUTE) == -1) if (acl_add_perm(perms, ACL_EXECUTE) == -1)
return NULL; return NULL;
if (acl_set_permset(entry, perms) == -1) if (acl_set_permset(entry, perms) == -1)
@ -159,13 +159,13 @@ acl_from_stat(const struct stat *sb)
return NULL; return NULL;
/* calculate other mode */ /* calculate other mode */
if (sb->st_mode & S_IROTH) if (mode & S_IROTH)
if (acl_add_perm(perms, ACL_READ) == -1) if (acl_add_perm(perms, ACL_READ) == -1)
return NULL; return NULL;
if (sb->st_mode & S_IWOTH) if (mode & S_IWOTH)
if (acl_add_perm(perms, ACL_WRITE) == -1) if (acl_add_perm(perms, ACL_WRITE) == -1)
return NULL; return NULL;
if (sb->st_mode & S_IXOTH) if (mode & S_IXOTH)
if (acl_add_perm(perms, ACL_EXECUTE) == -1) if (acl_add_perm(perms, ACL_EXECUTE) == -1)
return NULL; return NULL;
if (acl_set_permset(entry, perms) == -1) if (acl_set_permset(entry, perms) == -1)
@ -229,9 +229,9 @@ print_acl(char *path, acl_type_t type, int hflag, int iflag, int nflag,
errno = 0; errno = 0;
if (type == ACL_TYPE_DEFAULT) if (type == ACL_TYPE_DEFAULT)
return(0); return(0);
acl = acl_from_stat(&sb); acl = acl_from_mode(sb.st_mode);
if (!acl) { if (!acl) {
warn("%s: acl_from_stat() failed", path); warn("%s: acl_from_mode() failed", path);
return(-1); return(-1);
} }
} }