diff options
| author | B. Stack <bgstack15@gmail.com> | 2022-09-07 18:49:36 +0000 |
|---|---|---|
| committer | B. Stack <bgstack15@gmail.com> | 2022-09-07 18:49:36 +0000 |
| commit | 62bcefb8b809a32c6d26ab04ca686578bba5567a (patch) | |
| tree | fbc1dea58a6b28f1af4a9e9b2bc8e3e1d23b2103 /zen/resolve_path.cpp | |
| parent | Merge branch 'b11.23' into 'master' (diff) | |
| parent | add upstream 11.24 (diff) | |
| download | FreeFileSync-62bcefb8b809a32c6d26ab04ca686578bba5567a.tar.gz FreeFileSync-62bcefb8b809a32c6d26ab04ca686578bba5567a.tar.bz2 FreeFileSync-62bcefb8b809a32c6d26ab04ca686578bba5567a.zip | |
Merge branch 'b11.24' into 'master'11.24
add upstream 11.24
See merge request opensource-tracking/FreeFileSync!47
Diffstat (limited to 'zen/resolve_path.cpp')
| -rw-r--r-- | zen/resolve_path.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/zen/resolve_path.cpp b/zen/resolve_path.cpp index 357dab6a..99e2f6c6 100644 --- a/zen/resolve_path.cpp +++ b/zen/resolve_path.cpp @@ -9,7 +9,7 @@ #include "thread.h" #include "file_access.h" -#include <zen/sys_info.h> + #include <zen/sys_info.h> // #include <stdlib.h> //getenv() #include <unistd.h> //getuid() #include <pwd.h> //getpwuid_r() @@ -63,16 +63,16 @@ Zstring resolveRelativePath(const Zstring& relativePath) https://www.gnu.org/software/bash/manual/html_node/Tilde-Expansion.html */ if (startsWith(pathTmp, "~/") || pathTmp == "~") { - try - { - const Zstring& homePath = getUserHome(); //throw FileError + try + { + const Zstring& homePath = getUserHome(); //throw FileError if (startsWith(pathTmp, "~/")) pathTmp = appendPath(homePath, pathTmp.c_str() + 2); else //pathTmp == "~" pathTmp = homePath; - } - catch (FileError&) {} + } + catch (FileError&) {} //else: error! no further processing! } else |