diff options
| author | B. Stack <bgstack15@gmail.com> | 2022-12-16 21:08:02 -0500 |
|---|---|---|
| committer | B. Stack <bgstack15@gmail.com> | 2022-12-16 21:08:02 -0500 |
| commit | d35a4795f16e51f5773d00dce796f6948f82dae2 (patch) | |
| tree | b37279f6f8b354407507cc1a0e44691d6c63ffe8 /zen/resolve_path.cpp | |
| parent | add upstream 11.28 (diff) | |
| download | FreeFileSync-d35a4795f16e51f5773d00dce796f6948f82dae2.tar.gz FreeFileSync-d35a4795f16e51f5773d00dce796f6948f82dae2.tar.bz2 FreeFileSync-d35a4795f16e51f5773d00dce796f6948f82dae2.zip | |
add upstream 11.2911.29
Diffstat (limited to 'zen/resolve_path.cpp')
| -rw-r--r-- | zen/resolve_path.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/zen/resolve_path.cpp b/zen/resolve_path.cpp index 99e2f6c6..8b81e184 100644 --- a/zen/resolve_path.cpp +++ b/zen/resolve_path.cpp @@ -179,7 +179,7 @@ namespace //expand volume name if possible, return original input otherwise -Zstring expandVolumeName(Zstring pathPhrase) // [volname]:\folder [volname]\folder [volname]folder -> C:\folder +Zstring tryExpandVolumeName(Zstring pathPhrase) // [volname]:\folder [volname]\folder [volname]folder -> C:\folder { //we only expect the [.*] pattern at the beginning => do not touch dir names like "C:\somedir\[stuff]" trim(pathPhrase, true, false); @@ -205,7 +205,7 @@ std::vector<Zstring> zen::getPathPhraseAliases(const Zstring& itemPath) { //should use a replaceCpy() that considers "local path" case-sensitivity (if only we had one...) if (contains(itemPath, macroPath)) - pathAliases.push_back(makePathPhrase(replaceCpyAsciiNoCase(itemPath, macroPath, MACRO_SEP + Zstring(macroName) + MACRO_SEP))); + pathAliases.push_back(makePathPhrase(replaceCpyAsciiNoCase(itemPath, macroPath, Zstring() + MACRO_SEP + macroName + MACRO_SEP))); }; for (const Zchar* envName : @@ -242,7 +242,7 @@ Zstring zen::getResolvedFilePath(const Zstring& pathPhrase) //noexcept trim(path); //remove leading/trailing whitespace before allowing misinterpretation in applyLongPathPrefix() { - path = expandVolumeName(path); //may block for slow USB sticks and idle HDDs! + path = tryExpandVolumeName(path); //may block for slow USB sticks and idle HDDs! /* need to resolve relative paths: WINDOWS: |