mirror/borg
1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2024-12-26 17:57:59 +00:00
Code Issues Releases Wiki Activity

fs: Properly normalise paths on Windows

Browse source 
Use forward slashes and integrate the drive letter into the path.
This commit is contained in:
Rayyan Ansari 2023-06-25 17:38:54 +01:00
parent 349514446f
commit 54b654e3b1
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/borg/helpers/fs.py
View file

@ -1,7 +1,7 @@
import errno
import hashlib
import os
import os.path
import posixpath
import re
import stat
import subprocess
@ -231,7 +231,7 @@ def make_path_safe(path):
path = path.lstrip("/")
if path.startswith("../") or "/../" in path or path.endswith("/..") or path == "..":
raise ValueError(f"unexpected '..' element in path {path!r}")
path = os.path.normpath(path)
path = posixpath.normpath(path)
return path
@ -245,6 +245,11 @@ def remove_dotdot_prefixes(path):
`path` is expected to be normalized already (e.g. via `os.path.normpath()`).
"""
if is_win32:
if len(path) > 1 and path[1] == ":":
path = path.replace(":", "", 1)
path = path.replace("\\", "/")
path = path.lstrip("/")
path = _dotdot_re.sub("", path)
if path in ["", ".."]:

4
src/borg/testsuite/archiver/create_cmd.py
View file

@ -110,8 +110,8 @@ def test_archived_paths(self):
# To make our lives easier and to support cross-platform extraction we always use slashes.
# Similarly, archived paths are expected to be full, but relative (have no leading slash).
full_path = os.path.abspath(os.path.join(self.input_path, "test"))
# remove windows drive letter, if any:
posix_path = full_path[2:] if full_path[1] == ":" else full_path
# remove colon from windows drive letter, if any:
posix_path = full_path.replace(":", "") if full_path[1] == ":" else full_path
# only needed on windows in case there are backslashes:
posix_path = posix_path.replace("\\", "/")
# no leading slash in borg archives: