From: Andreas Gruenbacher Date: Fri, 29 May 2015 17:47:40 +0000 (+0200) Subject: acl-permissions: Fix build on Solaris and Cygwin X-Git-Tag: v1.0~7062 X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=188c4b491b1a93c70df0acd6b123695b7b308768;p=gnulib.git acl-permissions: Fix build on Solaris and Cygwin Reported by Tom G. Christensen : * lib/set-permissions.c (set_acls): The count, entries, ace_count, and ace_entries variables have moved into struct permission_context but they were still accessed as local variables here. --- diff --git a/ChangeLog b/ChangeLog index 82abe7f8a3..fb8b44677e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2015-05-29 Andreas Gruenbacher + + acl-permissions: Fix build on Solaris and Cygwin + Reported by Tom G. Christensen : + * lib/set-permissions.c (set_acls): The count, entries, ace_count, and + ace_entries variables have moved into struct permission_context but + they were still accessed as local variables here. + 2015-05-29 Pádraig Brady linkat: avoid OS X 10.10 trailing slash with symlink bug diff --git a/lib/set-permissions.c b/lib/set-permissions.c index 47cb91ca16..db3696c560 100644 --- a/lib/set-permissions.c +++ b/lib/set-permissions.c @@ -611,13 +611,13 @@ set_acls (struct permission_context *ctx, const char *name, int desc, if (ret == 0 && ctx->count) { if (desc != -1) - ret = facl (desc, SETACL, count, entries); + ret = facl (desc, SETACL, ctx->count, ctx->entries); else - ret = acl (name, SETACL, count, entries); + ret = acl (name, SETACL, ctx->count, ctx->entries); if (ret < 0) { if ((errno == ENOSYS || errno == EOPNOTSUPP || errno == EINVAL) - && acl_nontrivial (count, entries) == 0) + && acl_nontrivial (ctx->count, ctx->entries) == 0) ret = 0; } else @@ -628,13 +628,13 @@ set_acls (struct permission_context *ctx, const char *name, int desc, if (ret == 0 && ctx->ace_count) { if (desc != -1) - ret = facl (desc, ACE_SETACL, ace_count, ace_entries); + ret = facl (desc, ACE_SETACL, ctx->ace_count, ctx->ace_entries); else - ret = acl (name, ACE_SETACL, ace_count, ace_entries); + ret = acl (name, ACE_SETACL, ctx->ace_count, ctx->ace_entries); if (ret < 0) { if ((errno == ENOSYS || errno == EINVAL || errno == ENOTSUP) - && acl_ace_nontrivial (ace_count, ace_entries) == 0) + && acl_ace_nontrivial (ctx->ace_count, ctx->ace_entries) == 0) ret = 0; } else