src/libadacl.c: simplify the "." and ".." path handling.

[apply-default-acl.git] / src / libadacl.c

diff --git a/src/libadacl.c b/src/libadacl.c
index cdd07fcfee7c7400256e9ea619cc6abea99a195d..8ff0c17de6a8a91812469880af2003fbb6e6644f 100644 (file)
--- a/src/libadacl.c
+++ b/src/libadacl.c
@@ -1003,7 +1003,19 @@ int apply_default_acl(const char* path, bool recursive) {
     return ACL_ERROR;
   }
   char* parent = dirname(dirname_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.
+   */
+  bool path_is_dots = strcmp(path, ".") == 0 || strcmp(path, "..") == 0;
+  char dots_parent[6] = "../";
+  if (path_is_dots) {
+    parent = strcat(dots_parent, path);
+  }
+
   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)
@@ -1025,9 +1037,19 @@ int apply_default_acl(const char* path, bool recursive) {
   basename_path_copy = strdup(path);
   if (basename_path_copy == NULL) {
     perror("apply_default_acl (strdup)");
-    return ACL_ERROR;
+    result = ACL_ERROR;
+    goto cleanup;
+  }
+
+  /* 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. */
+  if (path_is_dots) {
+    fd = open(path, O_NOFOLLOW);
+  }
+  else {
+    fd = openat(parent_fd, basename(basename_path_copy), O_NOFOLLOW);
   }
-  fd = openat(parent_fd, basename(basename_path_copy), O_NOFOLLOW);
   if (fd == OPEN_ERROR) {
     if (errno == ELOOP || errno == ENOTDIR) {
       /* We hit a symlink, either in the last path component (ELOOP)