2 files changed, 20 insertions, 3 deletions
diff --git a/lib/lib.c b/lib/lib.c
index de67efa2..06e39169 100644
--- a/lib/lib.c
+++ b/lib/lib.c
@@ -177,9 +177,11 @@ int mkpathat(int atfd, char *dir, mode_t lastmode, int flags)
   // not-a-directory along the way, but the last one we must explicitly
   // test for. Might as well do it up front.
 
-  if (!fstatat(atfd, dir, &buf, 0) && !S_ISDIR(buf.st_mode)) {
-    errno = EEXIST;
-    return 1;
+  if (!fstatat(atfd, dir, &buf, 0)) {
+    if ((flags&MKPATHAT_MKLAST) && !S_ISDIR(buf.st_mode)) {
+      errno = EEXIST;
+      return 1;
+    } else return 0;
   }
 
   for (s = dir; ;s++) {
diff --git a/tests/install.test b/tests/install.test
new file mode 100755
index 00000000..228d2470
--- /dev/null
+++ b/tests/install.test
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+# TODO: fill this out.
+# TODO: "make install" means something else, so no test_install, only callable
+# from "make tests"...
+
+[ -f testing.sh ] && . testing.sh
+
+#testing "name" "command" "result" "infile" "stdin"
+
+dd if=/dev/urandom of=random bs=64 count=1 2> /dev/null
+testing "install -D exists" \
+  "mkdir -p a; touch a/b; install -D random a/b && cmp random a/b && echo yes" \
+  "yes\n" "" ""
+rm -rf a random