From: Michihiro NAKAJIMA <ggcueroad@gmail.com>
Date: Mon, 26 Dec 2011 19:22:48 +0000 (-0500)
Subject: Merge r4011 from trunk.
X-Git-Tag: v3.0.3~31
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5fb1f31983e4fb6de4b78f2fd4e2b4388e645247;p=thirdparty%2Flibarchive.git

Merge r4011 from trunk.

SVN-Revision: 4012
---

diff --git a/tar/tree.c b/tar/tree.c
index 1b971eb93..54cd4c2d5 100644
--- a/tar/tree.c
+++ b/tar/tree.c
@@ -319,6 +319,12 @@ tree_open(const char *path)
 	pathname[l] = '\0';
 	free(wcs);
 	base = pathname;
+#if defined(_WIN32) && !defined(__CYGWIN__)
+	/* ASCII version APIs do not accept the path which begin with
+	 * "//?/" prefix. */
+	if (strncmp(base, "//?/", 4) == 0)
+		base += 4;
+#endif
 
 	t = malloc(sizeof(*t));
 	memset(t, 0, sizeof(*t));