From f50ed941746c7c5ca4643080fbd2228491df6f19 Mon Sep 17 00:00:00 2001
From: Ryan Liptak <squeek502@hotmail.com>
Date: Tue, 23 Jun 2020 17:36:28 -0700
Subject: [PATCH 1/2] Windows: Fix fs.Dir.openDir not handling
 STATUS_NOT_A_DIRECTORY

Now correctly returns error.NotDir
---
 lib/std/fs.zig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/std/fs.zig b/lib/std/fs.zig
index 10422b9d54..6cb7d478b2 100644
--- a/lib/std/fs.zig
+++ b/lib/std/fs.zig
@@ -1099,6 +1099,7 @@ pub const Dir = struct {
             .OBJECT_NAME_INVALID => unreachable,
             .OBJECT_NAME_NOT_FOUND => return error.FileNotFound,
             .OBJECT_PATH_NOT_FOUND => return error.FileNotFound,
+            .NOT_A_DIRECTORY => return error.NotDir,
             .INVALID_PARAMETER => unreachable,
             else => return w.unexpectedStatus(rc),
         }

From dcdbb7006ca63a20c003a9928d1cb5e3d0d1cbdb Mon Sep 17 00:00:00 2001
From: Ryan Liptak <squeek502@hotmail.com>
Date: Tue, 23 Jun 2020 17:41:41 -0700
Subject: [PATCH 2/2] Add tests for using directory operations on files

---
 lib/std/fs/test.zig | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/lib/std/fs/test.zig b/lib/std/fs/test.zig
index 23a9c96ff5..b024f0f4f6 100644
--- a/lib/std/fs/test.zig
+++ b/lib/std/fs/test.zig
@@ -40,6 +40,39 @@ test "readAllAlloc" {
     testing.expectError(error.FileTooBig, file.readAllAlloc(testing.allocator, file_size, write_buf.len - 1));
 }
 
+test "directory operations on files" {
+    var tmp_dir = tmpDir(.{});
+    defer tmp_dir.cleanup();
+
+    const test_file_name = "test_file";
+
+    var file = try tmp_dir.dir.createFile(test_file_name, .{ .read = true });
+    file.close();
+
+    testing.expectError(error.PathAlreadyExists, tmp_dir.dir.makeDir(test_file_name));
+    testing.expectError(error.NotDir, tmp_dir.dir.openDir(test_file_name, .{}));
+    testing.expectError(error.NotDir, tmp_dir.dir.deleteDir(test_file_name));
+
+    if (builtin.os.tag != .wasi) {
+        // TODO: use Dir's realpath function once that exists
+        const absolute_path = blk: {
+            const relative_path = try fs.path.join(testing.allocator, &[_][]const u8{ "zig-cache", "tmp", tmp_dir.sub_path[0..], test_file_name });
+            defer testing.allocator.free(relative_path);
+            break :blk try fs.realpathAlloc(testing.allocator, relative_path);
+        };
+        defer testing.allocator.free(absolute_path);
+
+        testing.expectError(error.PathAlreadyExists, fs.makeDirAbsolute(absolute_path));
+        testing.expectError(error.NotDir, fs.deleteDirAbsolute(absolute_path));
+    }
+
+    // ensure the file still exists and is a file as a sanity check
+    file = try tmp_dir.dir.openFile(test_file_name, .{});
+    const stat = try file.stat();
+    testing.expect(stat.kind == .File);
+    file.close();
+}
+
 test "openSelfExe" {
     if (builtin.os.tag == .wasi) return error.SkipZigTest;