From 47c88c433d17948fab1d8e1d76121a72fe5938cb Mon Sep 17 00:00:00 2001 From: "B. Stack" Date: Wed, 7 Sep 2022 14:49:22 -0400 Subject: add upstream 11.24 --- zen/resolve_path.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'zen/resolve_path.cpp') 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 + #include // #include //getenv() #include //getuid() #include //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 -- cgit