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

Increase carried_error if we skip a file due to an error. This ensures

Browse Source 
that setfacl(1) exits with proper exit status on failure.

PR:		bin/149780
Submitted by:	Ævar Arnfjörð Bjarmason (original version)
Reviewed by:	trasz
MFC after:	3 weeks
This commit is contained in:
jh 2011-01-03 17:17:31 +00:00
parent 22fce0b1c2
commit 4c78089710
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bin/setfacl/setfacl.c
View File

@ -201,12 +201,14 @@ main(int argc, char *argv[])
if (stat(file->filename, &sb) == -1) {
warn("%s: stat() failed", file->filename);
carried_error++;
continue;
}
if (acl_type == ACL_TYPE_DEFAULT && S_ISDIR(sb.st_mode) == 0) {
warnx("%s: default ACL may only be set on a directory",
file->filename);
carried_error++;
continue;
}
@ -218,6 +220,7 @@ main(int argc, char *argv[])
if (acl_type == ACL_TYPE_DEFAULT) {
warnx("%s: there are no default entries "
"in NFSv4 ACLs", file->filename);
carried_error++;
continue;
}
acl_type = ACL_TYPE_NFS4;
@ -240,6 +243,7 @@ main(int argc, char *argv[])
else
warn("%s: acl_get_file() failed",
file->filename);
carried_error++;
continue;
}