Eliminate the is_path_directory() function.

The is_path_directory() function was only used in two places:

  1. To avoid involving nftw when the target is a file.
  2. To avoid setting (or trying to) a default ACL on a file.

The first one doesn't really matter, and the correct behavior is
tested, so the additional "is it a directory?" check has been
dropped. In the second case, we still don't want to try to set default
ACLs on files, but now the "is it a directory?" check is done at the
call site, where a stat structure is already available.

With those two uses gone, the function has been removed.

diff --git a/src/apply-default-acl.c b/src/apply-default-acl.c
index 0030431f481f5ec6acf8790ac923de4178a064eb..0a70b09d27dc7c88355e9cc339016b1f33357647 100644 (file)
--- a/src/apply-default-acl.c
+++ b/src/apply-default-acl.c
@@ -69,31 +69,6 @@ bool path_accessible(const char* path) {
 
 
 
-/**
- * @brief Determine whether or not the given path is a directory.
- *
- * @param path
- *   The path to test.
- *
- * @return true if @c path is a directory, false otherwise.
- */
-bool is_path_directory(const char* path) {
-  if (path == NULL) {
-    return false;
-  }
-
-  struct stat s;
-  if (lstat(path, &s) == 0) {
-    return S_ISDIR(s.st_mode);
-  }
-  else {
-    return false;
-  }
-}
-
-
-
-
 /**
  * @brief Update (or create) an entry in an @b minimal ACL.
  *
@@ -441,11 +416,10 @@ int any_can_execute(int fd, const struct stat* sp) {
 
 
 /**
- * @brief Set @c acl as the default ACL on @c path if it's a directory.
+ * @brief Set @c acl as the default ACL on @c path.
  *
- * This overwrites any existing default ACL on @c path. If no default
- * ACL exists, then one is created. If @c path is not a directory, we
- * return ACL_FAILURE but no error is raised.
+ * This overwrites any existing default ACL on @c path. If @c path is
+ * not a directory, we return ACL_ERROR and @c errno is set.
  *
  * @param path
  *   The target directory whose ACL we wish to replace or create.
@@ -455,7 +429,6 @@ int any_can_execute(int fd, const struct stat* sp) {
  *
  * @return
  *   - @c ACL_SUCCESS - The default ACL was assigned successfully.
- *   - @c ACL_FAILURE - If @c path is not a directory.
  *   - @c ACL_ERROR - Unexpected library error.
  */
 int assign_default_acl(const char* path, acl_t acl) {
@@ -466,11 +439,7 @@ int assign_default_acl(const char* path, acl_t acl) {
     return ACL_ERROR;
   }
 
-  if (!is_path_directory(path)) {
-    return ACL_FAILURE;
-  }
-
-    /* Our return value; success unless something bad happens. */
+  /* Our return value; success unless something bad happens. */
   int result = ACL_SUCCESS;
   acl_t path_acl = acl_dup(acl);
 
@@ -664,8 +633,13 @@ int apply_default_acl(const char* path,
     goto cleanup;
   }
 
-  /* If it's a directory, inherit the parent's default. */
-  if (assign_default_acl(path, defacl) == ACL_ERROR) {
+  /* If it's a directory, inherit the parent's default. We sure hope
+   * that "path" still points to the same thing that "fd" and this
+   * "sp" describe. If not, we may wind up trying to set a default ACL
+   * on a file, and this will throw an error. I guess that's what we
+   * want to do?
+   */
+  if (S_ISDIR(sp->st_mode) && assign_default_acl(path, defacl) == ACL_ERROR) {
     perror("apply_default_acl (assign_default_acl)");
     result = ACL_ERROR;
     goto cleanup;
@@ -863,11 +837,6 @@ int apply_default_acl_nftw_x(const char *target,
  *   we still return @c false.
  */
 bool apply_default_acl_recursive(const char *target, bool no_exec_mask) {
-
-  if (!is_path_directory(target)) {
-    return apply_default_acl(target, NULL, no_exec_mask);
-  }
-
   int max_levels = 256;
   int flags = FTW_PHYS; /* Don't follow links. */