From: Michael Orlitzky Date: Mon, 26 Feb 2018 01:03:44 +0000 (-0500) Subject: Inline the is_hardlink_safe() and is_regular_file() functions. X-Git-Tag: v0.1.0~26 X-Git-Url: https://gitweb.michael.orlitzky.com/?a=commitdiff_plain;h=aeedc5826cb0594318031e35acaf8b4a1b6e7c32;p=apply-default-acl.git Inline the is_hardlink_safe() and is_regular_file() functions. These two functions were only called in one place, and they were called right after one another. Both functions merely peek the stat structure for a file descriptor, so it's easier to stat the thing once and then just inline the two checks rather than setup/teardown everything twice. --- diff --git a/src/apply-default-acl.c b/src/apply-default-acl.c index b43a1c6..fb472a5 100644 --- a/src/apply-default-acl.c +++ b/src/apply-default-acl.c @@ -35,56 +35,6 @@ -/** - * @brief Determine if the given file descriptor might refer to an - * (unsafe) hard link. - * - * @param fd - * The file descriptor whose link count we want to investigate. - * - * @return true if we are certain that @c fd does not describe a hard - * link, and false otherwise. In case of error, false is returned, - * because we are not sure that @c fd is not a hard link. - */ -bool is_hardlink_safe(int fd) { - if (fd <= 0) { - return false; - } - struct stat s; - if (fstat(fd, &s) == 0) { - return (s.st_nlink == 1 || S_ISDIR(s.st_mode)); - } - else { - return false; - } -} - - -/** - * @brief Determine whether or not the given file descriptor is for - * a regular file. - * - * @param fd - * The file descriptor to test for regular-fileness. - * - * @return true if @c fd describes a regular file, and false otherwise. - */ -bool is_regular_file(int fd) { - if (fd <= 0) { - return false; - } - - struct stat s; - if (fstat(fd, &s) == 0) { - return S_ISREG(s.st_mode); - } - else { - return false; - } -} - - - /** * @brief Determine whether or not the given path is accessible. * @@ -679,16 +629,21 @@ int apply_default_acl(const char* path, bool no_exec_mask) { * between when we open the file descriptor (look above) and when we * fstat it. */ - if (!is_hardlink_safe(fd)) { - result = ACL_FAILURE; + struct stat s; + if (fstat(fd, &s) == -1) { + perror("apply_default_acl (fstat)"); goto cleanup; } - - if (!is_regular_file(fd) && !is_directory(fd)) { - result = ACL_FAILURE; - goto cleanup; + if (!S_ISDIR(s.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) { + result = ACL_FAILURE; + goto cleanup; + } } + /* Default to not masking the exec bit; i.e. applying the default ACL literally. If --no-exec-mask was not specified, then we try to "guess" whether or not to mask the exec bit. */