-/**
- * @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.
*
* @param fd
* The file descriptor to check.
*
+ * @param sp
+ * A pointer to a stat structure for @c fd.
+ *
* @return
* - @c ACL_SUCCESS - Someone has effective execute permissions on @c fd.
* - @c ACL_FAILURE - Nobody can execute @c fd.
* - @c ACL_ERROR - Unexpected library error.
*/
-int any_can_execute(int fd) {
+int any_can_execute(int fd, const struct stat* sp) {
acl_t acl = acl_get_fd(fd);
if (acl == (acl_t)NULL) {
int result = ACL_FAILURE;
if (acl_is_minimal(acl)) {
- struct stat s;
- if (fstat(fd, &s) == -1) {
- perror("any_can_execute (fstat)");
- result = ACL_ERROR;
- goto cleanup;
- }
- if (s.st_mode & (S_IXUSR | S_IXOTH | S_IXGRP)) {
+ if (sp->st_mode & (S_IXUSR | S_IXOTH | S_IXGRP)) {
result = ACL_SUCCESS;
goto cleanup;
}
/**
- * @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.
*
* @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) {
if (path == NULL) {
- errno = ENOENT;
+ errno = EINVAL;
+ perror("assign_default_acl (args)");
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);
* @param path
* The path whose ACL we would like to reset to its default.
*
+ * @param sp
+ * A pointer to a stat structure for @c path, or @c NULL if you don't
+ * have one handy.
+ *
* @param no_exec_mask
* The value (either true or false) of the --no-exec-mask flag.
*
* or the parent of @c path is not a directory.
* - @c ACL_ERROR - Unexpected library error.
*/
-int apply_default_acl(const char* path, bool no_exec_mask) {
+int apply_default_acl(const char* path,
+ const struct stat* sp,
+ bool no_exec_mask) {
if (path == NULL) {
errno = EINVAL;
/* The file descriptor corresponding to "path" */
int fd = 0;
- /* Split "path" into base/dirname parts to be used with openat().
- * We duplicate the strings involved because dirname/basename mangle
- * their arguments.
+ /* Get the parent directory of "path" with dirname(), which happens
+ * to murder its argument and necessitates a path_copy.
*/
char* path_copy = strdup(path);
if (path_copy == NULL) {
* race condition here, but the window is as small as possible
* between when we open the file descriptor (look above) and when we
* fstat it.
+ *
+ * Note: we only need to call fstat ourselves if we weren't passed a
+ * valid pointer to a stat structure (nftw does that).
*/
- struct stat s;
- if (fstat(fd, &s) == -1) {
- perror("apply_default_acl (fstat)");
- goto cleanup;
+ if (sp == NULL) {
+ struct stat s;
+ if (fstat(fd, &s) == -1) {
+ perror("apply_default_acl (fstat)");
+ goto cleanup;
+ }
+
+ sp = &s;
}
- if (!S_ISDIR(s.st_mode)) {
+
+ if (!S_ISDIR(sp->st_mode)) {
/* If it's not a directory, make sure it's a regular,
non-hard-linked file. */
- if (!S_ISREG(s.st_mode) || s.st_nlink != 1) {
+ if (!S_ISREG(sp->st_mode) || sp->st_nlink != 1) {
result = ACL_FAILURE;
goto cleanup;
}
if (!no_exec_mask) {
/* Never mask the execute bit on directories. */
- int ace_result = any_can_execute(fd) || S_ISDIR(s.st_mode);
+ int ace_result = any_can_execute(fd,sp) || S_ISDIR(sp->st_mode);
if (ace_result == ACL_ERROR) {
perror("apply_default_acl (any_can_execute)");
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;
*
*/
int apply_default_acl_nftw(const char *target,
- const struct stat *s,
+ const struct stat *sp,
int info,
struct FTW *ftw) {
- if (apply_default_acl(target, false)) {
+ if (apply_default_acl(target, sp, false)) {
return FTW_CONTINUE;
}
else {
*
*/
int apply_default_acl_nftw_x(const char *target,
- const struct stat *s,
+ const struct stat *sp,
int info,
struct FTW *ftw) {
- if (apply_default_acl(target, true)) {
+ if (apply_default_acl(target, sp, true)) {
return FTW_CONTINUE;
}
else {
* 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, no_exec_mask);
- }
-
int max_levels = 256;
int flags = FTW_PHYS; /* Don't follow links. */
}
else {
/* It's either a normal file, or we're not operating recursively. */
- reapp_result = apply_default_acl(target, no_exec_mask);
+ reapp_result = apply_default_acl(target, NULL, no_exec_mask);
}
if (!reapp_result) {
projects / apply-default-acl.git / blobdiff