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

Stop iterating over ACLs if we've already determined we

Browse Source 
will print them (i.e., number of successful calls to acl_get_entry()
exceeds 3).  This makes O(1) what was O(num_TYPE_ACCESS_ACLs).

This is a slightly modified version of submitter's patch.

PR: bin/65042
Submitted by: Christian S.J. Peron <maneo@bsdpro.com>
This commit is contained in:
Bosko Milekic 2004-04-03 16:55:56 +00:00
parent fdcac92868
commit 263377339c
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=127795
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
bin/ls/print.c
View File

@ -694,11 +694,17 @@ aclmode(char *buf, const FTSENT *p, int *haveacls)
*haveacls = 1;
if ((facl = acl_get_file(name, ACL_TYPE_ACCESS)) != NULL) {
if (acl_get_entry(facl, ACL_FIRST_ENTRY, &ae) == 1) {
entries = 0;
do
entries++;
while (acl_get_entry(facl, ACL_NEXT_ENTRY, &ae) == 1);
if (entries != 3)
entries = 1;
while (acl_get_entry(facl, ACL_NEXT_ENTRY, &ae) == 1)
if (++entries > 3)
break;
/*
* POSIX.1e requires that ACLs of type ACL_TYPE_ACCESS
* must have at least three entries (owner, group,
* and other). So anything with more than 3 ACLs looks
* interesting to us.
*/
if (entries > 3)
buf[10] = '+';
}
acl_free(facl);