X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=src%2Flibadacl.c;h=d2462c816f49420aaa2a09aff1fe2c2144f466ef;hb=8ec2f2bde7c53834a304bcdc68e84d8c7a748ca4;hp=911e69ae3022736eab1f30e1e463b7bd18188e73;hpb=1ad6e96c6b6d1ac60ce3f5e39e674d157fae53ad;p=apply-default-acl.git

diff --git a/src/libadacl.c b/src/libadacl.c
index 911e69a..d2462c8 100644
--- a/src/libadacl.c
+++ b/src/libadacl.c
@@ -1004,24 +1004,27 @@ int apply_default_acl(const char* path, bool recursive) {
   }
   char* parent = dirname(dirname_path_copy);
 
-  /* Just kidding, if the path is ".", then dirname will do the wrong
-   * thing and give us "." as its parent, too. So, we handle that as a
-   * special case.
-   *
-   * WARNING: it is important that "parent" itself is not used after
-   * this point; otherwise we would need to store the correct parent
-   * path in there. But since everything uses file descriptors from
-   * now on, we only need to ensure that we get the correct parent_fd
-   * below. */
-  if (strcmp(path, ".") == 0 && strcmp(parent, ".") == 0) {
-    parent_fd = safe_open("..", O_DIRECTORY | O_NOFOLLOW);
-  }
-  else if (strcmp(path, "..") == 0 && strcmp(parent, ".") == 0) {
-    parent_fd = safe_open("../..", O_DIRECTORY | O_NOFOLLOW);
+  basename_path_copy = strdup(path);
+  if (basename_path_copy == NULL) {
+    perror("apply_default_acl (strdup)");
+    result = ACL_ERROR;
+    goto cleanup;
   }
-  else {
-    parent_fd = safe_open(parent, O_DIRECTORY | O_NOFOLLOW);
+  char* child = basename(basename_path_copy);
+
+  /* Just kidding, if the path is "." or "..", then dirname will do
+   * the wrong thing and give us "." as its parent, too. So, we handle
+   * those as special cases. We use "child" instead of "path" here to
+   * catch things like "./" and "../"
+   */
+  bool path_is_dots = strcmp(child, ".") == 0 || strcmp(child, "..") == 0;
+  char dots_parent[6] = "../";
+  if (path_is_dots) {
+    parent = strcat(dots_parent, child);
   }
+
+  parent_fd = safe_open(parent, O_DIRECTORY | O_NOFOLLOW);
+
   if (parent_fd == OPEN_ERROR) {
     if (errno == ELOOP || errno == ENOTDIR) {
       /* We hit a symlink, either in the last path component (ELOOP)
@@ -1037,27 +1040,19 @@ int apply_default_acl(const char* path, bool recursive) {
   }
 
   /* We already obtained the parent fd safely, so if we use the
-     basename of path here instead of the full thing, then we can get
-     away with using openat() and spare ourselves the slowness of
-     another safe_open(). */
-  basename_path_copy = strdup(path);
-  if (basename_path_copy == NULL) {
-    perror("apply_default_acl (strdup)");
-    result = ACL_ERROR;
-    goto cleanup;
-  }
-
-  /* If the basename is ".", then we don't want to open "." relative
-     to the parent_fd, so we need another special case for that
-     path. */
-  if (strcmp(path, ".") == 0 && strcmp(parent, ".") == 0) {
-    fd = open(".", O_NOFOLLOW);
-  }
-  else if (strcmp(path, "..") == 0 && strcmp(parent, ".") == 0) {
-    fd = open("..", O_NOFOLLOW);
+   * basename of path here instead of the full thing, then we can get
+   * away with using openat() and spare ourselves the slowness of
+   * another safe_open().
+   *
+   * Note that if the basename is "." or "..", then we don't want to
+   * open it relative to the parent_fd, so we need another special
+   * case for those paths here.
+   */
+  if (path_is_dots) {
+    fd = open(child, O_NOFOLLOW);
   }
   else {
-    fd = openat(parent_fd, basename(basename_path_copy), O_NOFOLLOW);
+    fd = openat(parent_fd, child, O_NOFOLLOW);
   }
   if (fd == OPEN_ERROR) {
     if (errno == ELOOP || errno == ENOTDIR) {