]> git.ipfire.org Git - thirdparty/libarchive.git/commitdiff
Merge r4011 from trunk.
authorMichihiro NAKAJIMA <ggcueroad@gmail.com>
Mon, 26 Dec 2011 19:22:48 +0000 (14:22 -0500)
committerMichihiro NAKAJIMA <ggcueroad@gmail.com>
Mon, 26 Dec 2011 19:22:48 +0000 (14:22 -0500)
SVN-Revision: 4012

tar/tree.c

index 1b971eb931a9b43d47256172db69ddf4457b2400..54cd4c2d5baeb9cd00497451f7169b20499b0199 100644 (file)
@@ -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));