summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Matuška <martin@matuska.org>2022-12-06 12:11:34 +0100
committerGitHub <noreply@github.com>2022-12-06 12:11:34 +0100
commite2b1a66d0ab9b4fab2d6962657d2cb8121a80aae (patch)
tree10af32d9753ee6909aa8ab9cd688674bd21cc311
parent6c2077d8634ce062aacaee1f335c9485e1310a85 (diff)
parent9e18fdf7cd43a335ab6f613cd108bb6d75a51412 (diff)
downloadlibarchive-e2b1a66d0ab9b4fab2d6962657d2cb8121a80aae.tar.gz
Merge pull request #1771 from EwgeniWolowik/extend_cleanup_pathname_by_windows_remote_path
Fixed issue #1770: base dir deals with network drive paths like \\server\file
-rw-r--r--libarchive/archive_write_disk_windows.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/libarchive/archive_write_disk_windows.c b/libarchive/archive_write_disk_windows.c
index 5474de16..88df3ce0 100644
--- a/libarchive/archive_write_disk_windows.c
+++ b/libarchive/archive_write_disk_windows.c
@@ -2261,6 +2261,9 @@ cleanup_pathname(struct archive_write_disk *a, wchar_t *name)
return (ARCHIVE_FAILED);
} else
p += 4;
+ /* Network drive path like "\\<server-name>\<share-name>\file" */
+ } else if (p[0] == L'\\' && p[1] == L'\\') {
+ p += 2;
}
/* Skip leading drive letter from archives created