projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
NEWS.stable: log cherry-pick [e446f25]->[c092018] relocatable-shell: Update suggested...
[gnulib.git]
/
lib
/
file-has-acl.c
diff --git
a/lib/file-has-acl.c
b/lib/file-has-acl.c
index
bb8bae1
..
5104a41
100644
(file)
--- a/
lib/file-has-acl.c
+++ b/
lib/file-has-acl.c
@@
-1,6
+1,6
@@
/* Test whether a file has a nontrivial access control list.
/* Test whether a file has a nontrivial access control list.
- Copyright (C) 2002-2003, 2005-201
3
Free Software Foundation, Inc.
+ Copyright (C) 2002-2003, 2005-201
4
Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-75,8
+75,7
@@
acl_access_nontrivial (acl_t acl)
}
return got_one;
}
return got_one;
-# else /* IRIX, Tru64 */
-# if HAVE_ACL_TO_SHORT_TEXT /* IRIX */
+# elif HAVE_ACL_TO_SHORT_TEXT /* IRIX */
/* Don't use acl_get_entry: it is undocumented. */
int count = acl->acl_cnt;
/* Don't use acl_get_entry: it is undocumented. */
int count = acl->acl_cnt;
@@
-93,8
+92,7
@@
acl_access_nontrivial (acl_t acl)
}
return 0;
}
return 0;
-# endif
-# if HAVE_ACL_FREE_TEXT /* Tru64 */
+# elif HAVE_ACL_FREE_TEXT /* Tru64 */
/* Don't use acl_get_entry: it takes only one argument and does not work. */
int count = acl->acl_num;
/* Don't use acl_get_entry: it takes only one argument and does not work. */
int count = acl->acl_num;
@@
-117,7
+115,10
@@
acl_access_nontrivial (acl_t acl)
}
return 0;
}
return 0;
-# endif
+# else
+
+ errno = ENOSYS;
+ return -1;
# endif
}
# endif
}