5.7

1 files changed, 15 insertions, 6 deletions

diff --git a/lib/resolve_path.h b/lib/resolve_path.h
index bc74441a..ccc8f42e 100644
--- a/lib/resolve_path.h
+++ b/lib/resolve_path.h
@@ -1,25 +1,34 @@
 // **************************************************************************
 // * This file is part of the FreeFileSync project. It is distributed under *
 // * GNU General Public License: http://www.gnu.org/licenses/gpl.html       *
-// * Copyright (C) ZenJu (zhnmju123 AT gmx DOT de) - All Rights Reserved    *
+// * Copyright (C) ZenJu (zenju AT gmx DOT de) - All Rights Reserved        *
 // **************************************************************************
 
 #ifndef RESOLVE_PATH_H_INCLUDED
 #define RESOLVE_PATH_H_INCLUDED
 
+#include <vector>
 #include <zen/zstring.h>
 
-
 namespace zen
 {
-//resolve environment variables, relative paths, ect. and append file name separator
+/*
+FULL directory format:
+	- expand macros
+	- expand volume path by name
+	- convert relative paths into absolute
+	- trim whitespace and append file name separator
+*/
 Zstring getFormattedDirectoryName(const Zstring& dirString); //throw() - non-blocking! no I/O!
 
-#ifdef FFS_WIN
-std::vector<Zstring> getDirectoryAliases(const Zstring& dirString);
+//macro substitution only
+Zstring expandMacros(const Zstring& text);
 
-//this call may block if network is not reachable or when showing login prompt!
+#ifdef FFS_WIN
+//*blocks* if network is not reachable or when showing login prompt dialog!
 void loginNetworkShare(const Zstring& dirname, bool allowUserInteraction); //throw() - user interaction: show OS password prompt
+
+std::vector<Zstring> getDirectoryAliases(const Zstring& dirString);
 #endif
 }