From: Eric Biggers <ebiggers3@gmail.com>
Date: Sat, 27 Apr 2013 19:36:08 +0000 (-0500)
Subject: Win32 apply: More special checks for root directory
X-Git-Tag: v1.3.3~20
X-Git-Url: https://wimlib.net/git/?p=wimlib;a=commitdiff_plain;h=caa6d1f3c73c22a5a6425c215fce20eacec940e1

Win32 apply: More special checks for root directory
---

diff --git a/src/win32.c b/src/win32.c
index 06fd74d6..e7e89a21 100644
--- a/src/win32.c
+++ b/src/win32.c
@@ -1931,17 +1931,11 @@ win32_begin_extract_unnamed_stream(const struct wim_inode *inode,
 	/* Directories must be created with CreateDirectoryW().  Then the call
 	 * to CreateFileW() will merely open the directory that was already
 	 * created rather than creating a new file. */
-	if (inode->i_attributes & FILE_ATTRIBUTE_DIRECTORY) {
+	if (inode->i_attributes & FILE_ATTRIBUTE_DIRECTORY &&
+	    !path_is_root_of_drive(path)) {
 		if (!CreateDirectoryW(path, NULL)) {
 			err = GetLastError();
-			switch (err) {
-			case ERROR_ALREADY_EXISTS:
-				break;
-			case ERROR_ACCESS_DENIED:
-				if (path_is_root_of_drive(path))
-					break;
-				/* Fall through */
-			default:
+			if (err != ERROR_ALREADY_EXISTS) {
 				ERROR("Failed to create directory \"%ls\"",
 				      path);
 				win32_error(err);
@@ -2185,6 +2179,12 @@ try_open_again:
 			NULL);
 	if (h == INVALID_HANDLE_VALUE) {
 		err = GetLastError();
+		if (err == ERROR_ACCESS_DENIED &&
+		    path_is_root_of_drive(stream_path))
+		{
+			ret = 0;
+			goto out;
+		}
 		if (err == ERROR_PRIVILEGE_NOT_HELD &&
 		    (requestedAccess & ACCESS_SYSTEM_SECURITY))
 		{