Rename apply_default_acl() to apply_default_acl_ex() and add a wrapper.

[apply-default-acl.git] / src / apply-default-acl.c

diff --git a/src/apply-default-acl.c b/src/apply-default-acl.c
index c075059b3f693e44f213dc79d688fb7a74ab172e..e5b989ad9a585fe6224f16da93e969b34d07358c 100644 (file)
--- a/src/apply-default-acl.c
+++ b/src/apply-default-acl.c
@@ -9,14 +9,13 @@
 #define _XOPEN_SOURCE 500
 #define _GNU_SOURCE
 
-#include <errno.h>
-#include <fcntl.h>  /* AT_FOO constants */
-#include <ftw.h>    /* nftw() et al. */
-#include <getopt.h>
-#include <stdbool.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
+#include <fcntl.h>   /* AT_FOO constants */
+#include <ftw.h>     /* nftw() et al. */
+#include <getopt.h>  /* getopt_long() */
+#include <stdbool.h> /* the "bool" type */
+#include <stdio.h>   /* perror() */
+#include <stdlib.h>  /* EXIT_FAILURE, EXIT_SUCCESS */
+#include <unistd.h>  /* faccessat() */
 
 #include "libadacl.h"
 
@@ -92,7 +91,7 @@ int apply_default_acl_nftw(const char *target,
                           int info,
                           struct FTW *ftw) {
 
-  if (apply_default_acl(target, sp, false)) {
+  if (apply_default_acl_ex(target, sp, false)) {
     return FTW_CONTINUE;
   }
   else {
@@ -114,7 +113,7 @@ int apply_default_acl_nftw_x(const char *target,
                             int info,
                             struct FTW *ftw) {
 
-  if (apply_default_acl(target, sp, true)) {
+  if (apply_default_acl_ex(target, sp, true)) {
     return FTW_CONTINUE;
   }
   else {
@@ -248,7 +247,7 @@ int main(int argc, char* argv[]) {
     }
     else {
       /* It's either a normal file, or we're not operating recursively. */
-      reapp_result = apply_default_acl(target, NULL, no_exec_mask);
+      reapp_result = apply_default_acl(target, no_exec_mask);
     }
 
     if (!reapp_result) {