From b38dc7ebeaf3fd1bc45ad7a2a75673813ba76d61 Mon Sep 17 00:00:00 2001 From: Jaakko Heinonen Date: Mon, 3 Jan 2011 17:17:31 +0000 Subject: [PATCH] Increase carried_error if we skip a file due to an error. This ensures that setfacl(1) exits with proper exit status on failure. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit PR: bin/149780 Submitted by: Ævar Arnfjörð Bjarmason (original version) Reviewed by: trasz MFC after: 3 weeks --- bin/setfacl/setfacl.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/bin/setfacl/setfacl.c b/bin/setfacl/setfacl.c index 42f4731e5bef..75347945f7ba 100644 --- a/bin/setfacl/setfacl.c +++ b/bin/setfacl/setfacl.c @@ -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; }