Merge branch '11.6' into 'master'11.6

add upstream 11.6

See merge request opensource-tracking/FreeFileSync!30

1 files changed, 34 insertions, 0 deletions

diff --git a/zen/resolve_path.h b/zen/resolve_path.h
new file mode 100644
index 00000000..f2c427f1
--- /dev/null
+++ b/zen/resolve_path.h
@@ -0,0 +1,34 @@
+// *****************************************************************************
+// * This file is part of the FreeFileSync project. It is distributed under    *
+// * GNU General Public License: https://www.gnu.org/licenses/gpl-3.0          *
+// * Copyright (C) Zenju (zenju AT freefilesync DOT org) - All Rights Reserved *
+// *****************************************************************************
+
+#ifndef RESOLVE_PATH_H_817402834713454
+#define RESOLVE_PATH_H_817402834713454
+
+#include <vector>
+#include "zstring.h"
+
+
+namespace zen
+{
+/*
+    - expand macros
+    - trim whitespace
+    - expand volume path by name
+    - convert relative paths into absolute
+
+    => may block for slow USB sticks and idle HDDs
+    => not thread-safe, see ::GetFullPathName()!
+*/
+Zstring getResolvedFilePath(const Zstring& pathPhrase); //noexcept
+
+//macro substitution only
+Zstring expandMacros(const Zstring& text);
+
+std::vector<Zstring> getFolderPathAliases(const Zstring& folderPathPhrase); //may block for slow USB sticks when resolving [<volume name>]
+
+}
+
+#endif //RESOLVE_PATH_H_817402834713454