X-Git-Url: https://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=src%2Fapply-default-acl.c;h=1eb49c44fd88b9d403c2bc0b4c8cce28e1e6ce87;hb=40a0da32d5f91b416f45d8e66c4406774f3b6383;hp=de4e1acc3b7b7cd10654ac4e389814d0786c6d89;hpb=a7187b9c820583d75581c6fe7e26e38ed9e24f7e;p=apply-default-acl.git

diff --git a/src/apply-default-acl.c b/src/apply-default-acl.c
index de4e1ac..1eb49c4 100644
--- a/src/apply-default-acl.c
+++ b/src/apply-default-acl.c
@@ -34,35 +34,6 @@
 
 
 
-/**
- * @brief Get the mode bits from the given file descriptor.
- *
- * @param fd
- *   The file descriptor (which may reference a directory) whose
- *   mode we want.
- *
- * @return A mode_t (st_mode) structure containing the mode bits.
- *   See sys/stat.h for details.
- */
-mode_t get_mode(int fd) {
-  if (fd <= 0) {
-    errno = ENOENT;
-    return ACL_ERROR;
-  }
-
-  struct stat s;
-  int result = fstat(fd, &s);
-
-  if (result == 0) {
-    return s.st_mode;
-  }
-  else {
-    /* errno will be set already by lstat() */
-    return result;
-  }
-}
-
-
 
 /**
  * @brief Determine if the given file descriptor might refer to an
@@ -80,8 +51,7 @@ bool is_hardlink_safe(int fd) {
     return false;
   }
   struct stat s;
-  int result = fstat(fd, &s);
-  if (result == 0) {
+  if (fstat(fd, &s) == 0) {
     return (s.st_nlink == 1 || S_ISDIR(s.st_mode));
   }
   else {
@@ -105,8 +75,7 @@ bool is_regular_file(int fd) {
   }
 
   struct stat s;
-  int result = fstat(fd, &s);
-  if (result == 0) {
+  if (fstat(fd, &s) == 0) {
     return S_ISREG(s.st_mode);
   }
   else {
@@ -140,9 +109,7 @@ bool path_accessible(const char* path) {
 
   /* If the path is relative, interpret it relative to the current
      working directory (just like the access() system call). */
-  int result = faccessat(AT_FDCWD, path, F_OK, flags);
-
-  if (result == 0) {
+  if (faccessat(AT_FDCWD, path, F_OK, flags) == 0) {
     return true;
   }
   else {
@@ -166,8 +133,7 @@ bool is_path_directory(const char* path) {
   }
 
   struct stat s;
-  int result = lstat(path, &s);
-  if (result == 0) {
+  if (lstat(path, &s) == 0) {
     return S_ISDIR(s.st_mode);
   }
   else {
@@ -191,8 +157,7 @@ bool is_directory(int fd) {
   }
 
   struct stat s;
-  int result = fstat(fd, &s);
-  if (result == 0) {
+  if (fstat(fd, &s) == 0) {
     return S_ISDIR(s.st_mode);
   }
   else {
@@ -226,19 +191,16 @@ bool is_directory(int fd) {
  *   returned. Otherwise, @c ACL_SUCCESS.
  *
  */
-int acl_set_entry(acl_t* aclp,
-		  acl_entry_t entry) {
+int acl_set_entry(acl_t* aclp, acl_entry_t entry) {
 
   acl_tag_t entry_tag;
-  int gt_result = acl_get_tag_type(entry, &entry_tag);
-  if (gt_result == ACL_ERROR) {
+  if (acl_get_tag_type(entry, &entry_tag) == ACL_ERROR) {
     perror("acl_set_entry (acl_get_tag_type)");
     return ACL_ERROR;
   }
 
   acl_permset_t entry_permset;
-  int ps_result = acl_get_permset(entry, &entry_permset);
-  if (ps_result == ACL_ERROR) {
+  if (acl_get_permset(entry, &entry_permset) == ACL_ERROR) {
     perror("acl_set_entry (acl_get_permset)");
     return ACL_ERROR;
   }
@@ -249,9 +211,8 @@ int acl_set_entry(acl_t* aclp,
 
   while (result == ACL_SUCCESS) {
     acl_tag_t existing_tag = ACL_UNDEFINED_TAG;
-    int tag_result = acl_get_tag_type(existing_entry, &existing_tag);
 
-    if (tag_result == ACL_ERROR) {
+    if (acl_get_tag_type(existing_entry, &existing_tag) == ACL_ERROR) {
        perror("set_acl_tag_permset (acl_get_tag_type)");
        return ACL_ERROR;
     }
@@ -265,14 +226,12 @@ int acl_set_entry(acl_t* aclp,
 	   match one of them, we're allowed to return ACL_SUCCESS
 	   below and bypass the rest of the function. */
 	acl_permset_t existing_permset;
-	int gep_result = acl_get_permset(existing_entry, &existing_permset);
-	if (gep_result == ACL_ERROR) {
+	if (acl_get_permset(existing_entry, &existing_permset) == ACL_ERROR) {
 	  perror("acl_set_entry (acl_get_permset)");
 	  return ACL_ERROR;
 	}
 
-	int s_result = acl_set_permset(existing_entry, entry_permset);
-	if (s_result == ACL_ERROR) {
+	if (acl_set_permset(existing_entry, entry_permset) == ACL_ERROR) {
 	  perror("acl_set_entry (acl_set_permset)");
 	  return ACL_ERROR;
 	}
@@ -303,20 +262,17 @@ int acl_set_entry(acl_t* aclp,
    * be fed to acl_free(). In other words, we should still be freeing
    * the right thing, even if the value pointed to by aclp changes.
    */
-  int c_result = acl_create_entry(aclp, &new_entry);
-  if (c_result == ACL_ERROR) {
+  if (acl_create_entry(aclp, &new_entry) == ACL_ERROR) {
     perror("acl_set_entry (acl_create_entry)");
     return ACL_ERROR;
   }
 
-  int st_result = acl_set_tag_type(new_entry, entry_tag);
-  if (st_result == ACL_ERROR) {
+  if (acl_set_tag_type(new_entry, entry_tag) == ACL_ERROR) {
     perror("acl_set_entry (acl_set_tag_type)");
     return ACL_ERROR;
   }
 
-  int s_result = acl_set_permset(new_entry, entry_permset);
-  if (s_result == ACL_ERROR) {
+  if (acl_set_permset(new_entry, entry_permset) == ACL_ERROR) {
     perror("acl_set_entry (acl_set_permset)");
     return ACL_ERROR;
   }
@@ -329,8 +285,7 @@ int acl_set_entry(acl_t* aclp,
       return ACL_ERROR;
     }
 
-    int sq_result = acl_set_qualifier(new_entry, entry_qual);
-    if (sq_result == ACL_ERROR) {
+    if (acl_set_qualifier(new_entry, entry_qual) == ACL_ERROR) {
       perror("acl_set_entry (acl_set_qualifier)");
       return ACL_ERROR;
     }
@@ -421,9 +376,8 @@ int acl_execute_masked(acl_t acl) {
 
   while (ge_result == ACL_SUCCESS) {
     acl_tag_t tag = ACL_UNDEFINED_TAG;
-    int tag_result = acl_get_tag_type(entry, &tag);
 
-    if (tag_result == ACL_ERROR) {
+    if (acl_get_tag_type(entry, &tag) == ACL_ERROR) {
        perror("acl_execute_masked (acl_get_tag_type)");
        return ACL_ERROR;
     }
@@ -433,8 +387,7 @@ int acl_execute_masked(acl_t acl) {
 	 execute is specified. */
       acl_permset_t permset;
 
-      int ps_result = acl_get_permset(entry, &permset);
-      if (ps_result == ACL_ERROR) {
+      if (acl_get_permset(entry, &permset) == ACL_ERROR) {
 	perror("acl_execute_masked (acl_get_permset)");
 	return ACL_ERROR;
       }
@@ -499,8 +452,13 @@ int any_can_execute_or_dir(int fd) {
   int result = ACL_FAILURE;
 
   if (acl_is_minimal(acl)) {
-    mode_t mode = get_mode(fd);
-    if (mode & (S_IXUSR | S_IXOTH | S_IXGRP)) {
+    struct stat s;
+    if (fstat(fd, &s) == -1) {
+      perror("any_can_execute_or_dir (fstat)");
+      result = ACL_ERROR;
+      goto cleanup;
+    }
+    if (s.st_mode & (S_IXUSR | S_IXOTH | S_IXGRP)) {
       result = ACL_SUCCESS;
       goto cleanup;
     }
@@ -517,9 +475,8 @@ int any_can_execute_or_dir(int fd) {
     /* The first thing we do is check to see if this is a mask
        entry. If it is, we skip it entirely. */
     acl_tag_t tag = ACL_UNDEFINED_TAG;
-    int tag_result = acl_get_tag_type(entry, &tag);
 
-    if (tag_result == ACL_ERROR) {
+    if (acl_get_tag_type(entry, &tag) == ACL_ERROR) {
       perror("any_can_execute_or_dir (acl_get_tag_type)");
       result = ACL_ERROR;
       goto cleanup;
@@ -533,8 +490,7 @@ int any_can_execute_or_dir(int fd) {
     /* Ok, so it's not a mask entry. Check the execute perms. */
     acl_permset_t permset;
 
-    int ps_result = acl_get_permset(entry, &permset);
-    if (ps_result == ACL_ERROR) {
+    if (acl_get_permset(entry, &permset) == ACL_ERROR) {
       perror("any_can_execute_or_dir (acl_get_permset)");
       result = ACL_ERROR;
       goto cleanup;
@@ -609,8 +565,7 @@ int assign_default_acl(const char* path, acl_t acl) {
     return ACL_ERROR; /* Nothing to clean up in this case. */
   }
 
-  int sf_result = acl_set_file(path, ACL_TYPE_DEFAULT, path_acl);
-  if (sf_result == ACL_ERROR) {
+  if (acl_set_file(path, ACL_TYPE_DEFAULT, path_acl) == ACL_ERROR) {
     perror("assign_default_acl (acl_set_file)");
     result = ACL_ERROR;
   }
@@ -758,8 +713,7 @@ int apply_default_acl(const char* path, bool no_exec_mask) {
     goto cleanup;
   }
 
-  int wipe_result = wipe_acls(fd);
-  if (wipe_result == ACL_ERROR) {
+  if (wipe_acls(fd) == ACL_ERROR) {
     perror("apply_default_acl (wipe_acls)");
     result = ACL_ERROR;
     goto cleanup;
@@ -775,8 +729,7 @@ int apply_default_acl(const char* path, bool no_exec_mask) {
   }
 
   /* If it's a directory, inherit the parent's default. */
-  int inherit_result = assign_default_acl(path, defacl);
-  if (inherit_result == ACL_ERROR) {
+  if (assign_default_acl(path, defacl) == ACL_ERROR) {
     perror("apply_default_acl (assign_default_acl)");
     result = ACL_ERROR;
     goto cleanup;
@@ -787,9 +740,8 @@ int apply_default_acl(const char* path, bool no_exec_mask) {
 
   while (ge_result == ACL_SUCCESS) {
     acl_tag_t tag = ACL_UNDEFINED_TAG;
-    int tag_result = acl_get_tag_type(entry, &tag);
 
-    if (tag_result == ACL_ERROR) {
+    if (acl_get_tag_type(entry, &tag) == ACL_ERROR) {
        perror("apply_default_acl (acl_get_tag_type)");
        result = ACL_ERROR;
        goto cleanup;
@@ -798,8 +750,7 @@ int apply_default_acl(const char* path, bool no_exec_mask) {
 
     /* We've got an entry/tag from the default ACL. Get its permset. */
     acl_permset_t permset;
-    int ps_result = acl_get_permset(entry, &permset);
-    if (ps_result == ACL_ERROR) {
+    if (acl_get_permset(entry, &permset) == ACL_ERROR) {
       perror("apply_default_acl (acl_get_permset)");
       result = ACL_ERROR;
       goto cleanup;
@@ -815,15 +766,13 @@ int apply_default_acl(const char* path, bool no_exec_mask) {
 	/* The mask doesn't affect acl_user_obj, acl_group_obj (in
 	   minimal ACLs) or acl_other entries, so if execute should be
 	   masked, we have to do it manually. */
-	int d_result = acl_delete_perm(permset, ACL_EXECUTE);
-	if (d_result == ACL_ERROR) {
+	if (acl_delete_perm(permset, ACL_EXECUTE) == ACL_ERROR) {
 	  perror("apply_default_acl (acl_delete_perm)");
 	  result = ACL_ERROR;
 	  goto cleanup;
 	}
 
-	int sp_result = acl_set_permset(entry, permset);
-	if (sp_result == ACL_ERROR) {
+	if (acl_set_permset(entry, permset) == ACL_ERROR) {
 	  perror("apply_default_acl (acl_set_permset)");
 	  result = ACL_ERROR;
 	  goto cleanup;
@@ -847,8 +796,7 @@ int apply_default_acl(const char* path, bool no_exec_mask) {
      * called right here, we need acl_create_entry() to update the
      * value of "acl". To do that, it needs the address of "acl".
      */
-    int set_result = acl_set_entry(&acl, entry);
-    if (set_result == ACL_ERROR) {
+    if (acl_set_entry(&acl, entry) == ACL_ERROR) {
       perror("apply_default_acl (acl_set_entry)");
       result = ACL_ERROR;
       goto cleanup;
@@ -865,8 +813,7 @@ int apply_default_acl(const char* path, bool no_exec_mask) {
     goto cleanup;
   }
 
-  int sf_result = acl_set_fd(fd, acl);
-  if (sf_result == ACL_ERROR) {
+  if (acl_set_fd(fd, acl) == ACL_ERROR) {
     perror("apply_default_acl (acl_set_fd)");
     result = ACL_ERROR;
     goto cleanup;
@@ -923,8 +870,7 @@ int apply_default_acl_nftw(const char *target,
 			   int info,
 			   struct FTW *ftw) {
 
-  bool app_result = apply_default_acl(target, false);
-  if (app_result) {
+  if (apply_default_acl(target, false)) {
     return FTW_CONTINUE;
   }
   else {
@@ -946,8 +892,7 @@ int apply_default_acl_nftw_x(const char *target,
 			     int info,
 			     struct FTW *ftw) {
 
-  bool app_result = apply_default_acl(target, true);
-  if (app_result) {
+  if (apply_default_acl(target, true)) {
     return FTW_CONTINUE;
   }
   else {