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

diff --git a/src/libadacl.c b/src/libadacl.c
index 53bd380..911e69a 100644
--- a/src/libadacl.c
+++ b/src/libadacl.c
@@ -607,8 +607,14 @@ int acl_copy_xattr(int src_fd,
     return ACL_ERROR;
   }
   char* src_acl_p = alloca(src_size_guess);
-  /* The actual size may be smaller than our guess? I don't know. */
-  ssize_t src_size = fgetxattr(src_fd, src_name, src_acl_p, src_size_guess);
+  /* The actual size may be smaller than our guess? I don't know. The
+     return value from fgetxattr() will either be nonnegative, or
+     XATTR_ERROR (which we've already ruled out), so it's safe to cast
+     it to an unsigned size_t here to avoid a compiler warning. */
+  ssize_t src_size = fgetxattr(src_fd,
+                               src_name,
+                               src_acl_p,
+                               (size_t)src_size_guess);
   if (src_size == XATTR_ERROR) {
     if (errno == ENODATA) {
       /* A missing ACL isn't an error. */
@@ -618,7 +624,14 @@ int acl_copy_xattr(int src_fd,
     return ACL_ERROR;
   }
 
-  if (fsetxattr(dst_fd, dst_name, src_acl_p, src_size, 0) == XATTR_ERROR) {
+  /* See above: src_size must be nonnegative at this point,so we cast
+     it to size_t to avoid a compiler warning. */
+  if (fsetxattr(dst_fd,
+                dst_name,
+                src_acl_p,
+                (size_t)src_size,
+                0)
+      == XATTR_ERROR) {
     perror("acl_copy_xattr (fsetxattr)");
     return ACL_ERROR;
   }
@@ -990,7 +1003,25 @@ int apply_default_acl(const char* path, bool recursive) {
     return ACL_ERROR;
   }
   char* parent = dirname(dirname_path_copy);
-  parent_fd = safe_open(parent, O_DIRECTORY | O_NOFOLLOW);
+
+  /* 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);
+  }
+  else {
+    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)
@@ -1012,9 +1043,22 @@ 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 ".", 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);
+  }
+  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)