From f6e2860e8aec35aa56a2a4bc08e6e71715214eb1 Mon Sep 17 00:00:00 2001 From: Sergey Poznyakoff Date: Mon, 12 Nov 2018 09:15:22 +0200 Subject: [PATCH] Fix verbose ACL listing * src/xattrs.c (acls_one_line): Advance pos. (xattrs_print): Insert a comma between ACL and default ACL if both are non-empty. --- src/xattrs.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/xattrs.c b/src/xattrs.c index 5049d08b..d7e4701e 100644 --- a/src/xattrs.c +++ b/src/xattrs.c @@ -336,6 +336,7 @@ acls_one_line (const char *prefix, char delim, obstack_grow (&stk, prefix, pref_len); obstack_grow (&stk, aclstring, move); + pos += move + 1; aclstring += move + 1; } @@ -740,6 +741,8 @@ xattrs_print (struct tar_stat_info const *st) { fprintf (stdlis, " a: "); acls_one_line ("", ',', st->acls_a_ptr, st->acls_a_len); + if (st->acls_a_len && st->acls_d_len) + fprintf (stdlis, ","); acls_one_line ("default:", ',', st->acls_d_ptr, st->acls_d_len); fprintf (stdlis, "\n"); } -- 2.47.3