changeset 14871:82d665ed443a

acl: Fix test failure on AIX 7. * tests/test-sameacls.c (main) [AIX]: Fix aclx_printStr invocation. Based on a patch by Jørn Amundsen <Jorn.Amundsen@ntnu.no>.
author Bruno Haible <bruno@clisp.org>
date Sun, 05 Jun 2011 20:08:15 +0200
parents d52404af0321
children dcccd3e763ae
files ChangeLog tests/test-sameacls.c
diffstat 2 files changed, 10 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-06-05  Bruno Haible  <bruno@clisp.org>
+
+	acl: Fix test failure on AIX 7.
+	* tests/test-sameacls.c (main) [AIX]: Fix aclx_printStr invocation.
+	Based on a patch by Jørn Amundsen <Jorn.Amundsen@ntnu.no>.
+
 2011-06-05  Bruno Haible  <bruno@clisp.org>
 
 	pipe-filter-ii: Fix test failure on AIX and IRIX.
--- a/tests/test-sameacls.c
+++ b/tests/test-sameacls.c
@@ -430,11 +430,13 @@
   size_t aclsize1 = sizeof (acl1);
   mode_t mode1;
   char text1[1000];
+  size_t textsize1 = sizeof (text1);
   acl_type_t type2;
   char acl2[1000];
   size_t aclsize2 = sizeof (acl2);
   mode_t mode2;
   char text2[1000];
+  size_t textsize2 = sizeof (text2);
 
   /* The docs say that type1 being 0 is equivalent to ACL_ANY, but it is not
      true, in AIX 5.3.  */
@@ -445,7 +447,7 @@
       fflush (stderr);
       abort ();
     }
-  if (aclx_printStr (text1, sizeof (text1), acl1, aclsize1, type1, file1, 0) < 0)
+  if (aclx_printStr (text1, &textsize1, acl1, aclsize1, type1, file1, 0) < 0)
     {
       fprintf (stderr, "cannot convert the ACLs of file %s to text\n", file1);
       fflush (stderr);
@@ -461,7 +463,7 @@
       fflush (stderr);
       abort ();
     }
-  if (aclx_printStr (text2, sizeof (text2), acl2, aclsize2, type2, file2, 0) < 0)
+  if (aclx_printStr (text2, &textsize2, acl2, aclsize2, type2, file2, 0) < 0)
     {
       fprintf (stderr, "cannot convert the ACLs of file %s to text\n", file2);
       fflush (stderr);