JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

setfacl(1): Fix handling of -m and -x on a single commandline

Browse Source 
* setfacl.cc (delace): New helper function to delete a single ACE.
        (delacl): Call delace.
        (modacl): Ditto, if entry is supposed to get deleted.  Align comments.

Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
This commit is contained in:
Corinna Vinschen 2015-12-21 18:15:57 +01:00
parent c2bbc54a62
commit bb231f6a62
2 changed files with 28 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
winsup/utils/ChangeLog
View File

@ -1,3 +1,9 @@
2015-12-21 Corinna Vinschen <corinna@vinschen.de>
* setfacl.cc (delace): New helper function to delete a single ACE.
(delacl): Call delace.
(modacl): Ditto, if entry is supposed to get deleted. Align comments.
2015-12-21 Corinna Vinschen <corinna@vinschen.de> 2015-12-21 Corinna Vinschen <corinna@vinschen.de>
* setfacl.cc (modacl): Move recomputing mask into new function. * setfacl.cc (modacl): Move recomputing mask into new function.

31
winsup/utils/setfacl.c
View File

@ -241,6 +241,17 @@ searchace (aclent_t *aclp, int nentries, int type, int id)
return -1; return -1;
} }
int
delace (aclent_t *tgt, int tcnt, int t)
{
int i;
for (i = t + 1; i < tcnt; ++i)
tgt[i - 1] = tgt[i];
--tcnt;
return tcnt;
}
int int
delacl (aclent_t *tgt, int tcnt, aclent_t *src, int scnt) delacl (aclent_t *tgt, int tcnt, aclent_t *src, int scnt)
{ {
@ -253,11 +264,7 @@ delacl (aclent_t *tgt, int tcnt, aclent_t *src, int scnt)
if (t < 0) if (t < 0)
return -1; return -1;
if (t < tcnt) if (t < tcnt)
{ tcnt = delace (tgt, tcnt, t);
for (i = t + 1; i < tcnt; ++i)
tgt[i - 1] = tgt[i];
--tcnt;
}
} }
return tcnt; return tcnt;
} }
@ -267,16 +274,22 @@ modacl (aclent_t *tgt, int tcnt, aclent_t *src, int scnt)
{ {
int t, s; int t, s;
/* Replace or add given acl entries. */ /* Delete, replace or add given acl entries. */
for (s = 0; s < scnt; ++s) for (s = 0; s < scnt; ++s)
{ {
t = searchace (tgt, MAX_ACL_ENTRIES, src[s].a_type, t = searchace (tgt, MAX_ACL_ENTRIES, src[s].a_type,
(src[s].a_type & (USER | GROUP)) ? src[s].a_id : -1); (src[s].a_type & (USER | GROUP)) ? src[s].a_id : -1);
if (t < 0) if (t < 0)
return -1; return -1;
tgt[t] = src[s]; /* ILLEGAL_MODE means "delete". */
if (t >= tcnt) if (src[s].a_perm == ILLEGAL_MODE && t < tcnt)
++tcnt; tcnt = delace (tgt, tcnt, t);
else
{
tgt[t] = src[s];
if (t >= tcnt)
++tcnt;
}
} }
return tcnt; return tcnt;
} }