add a force flag

Author: stefankueng

PathUtils.cpp

@@ -42,9 +42,9 @@ namespace
 {
 // These variables are not exposed as any path name handling probably
 // should be a function in here rather than be manipulating strings directly / inline.
-constexpr wchar_t thisOsPathSeparator  = L'\\';
-constexpr wchar_t otherOsPathSeparator = L'/';
-constexpr wchar_t DeviceSeparator      = L':';
+const wchar_t thisOsPathSeparator  = L'\\';
+const wchar_t otherOsPathSeparator = L'/';
+const wchar_t DeviceSeparator      = L':';
 
 // Check if the character given is either type of folder separator.
 // if we want to remove support for "other"separators we can just
@@ -121,23 +121,12 @@ std::wstring CPathUtils::GetLongPathname(const std::wstring& path)
     }
     if (ret == 0)
         return path;
-    if (sRet.starts_with('\\'))
-    {
-        ret = GetFullPathName(sRet.c_str(), 0, nullptr, nullptr);
-        if (ret)
-        {
-            auto fullPath = std::make_unique<wchar_t[]>(ret + 2);
-            ret           = GetFullPathName(sRet.c_str(), ret + 1, fullPath.get(), nullptr);
-            if (ret)
-                sRet = std::wstring(fullPath.get(), ret);
-        }
-    }
     return sRet;
 }
 
-std::wstring CPathUtils::AdjustForMaxPath(const std::wstring& path)
+std::wstring CPathUtils::AdjustForMaxPath(const std::wstring& path, bool force)
 {
-    if (path.size() < 248) // 248 instead of MAX_PATH because 248 is the limit for directories
+    if (!force && path.size() < 248) // 248 instead of MAX_PATH because 248 is the limit for directories
         return path;
     if (path.substr(0, 4).compare(L"\\\\?\\") == 0)
         return path;
@@ -708,7 +697,7 @@ bool CPathUtils::CreateRecursiveDirectory(const std::wstring& path)
 public:
     CPathTests()
     {
-        assert(CPathUtils::AdjustForMaxPath(L"c:\\") == L"c:\\");
+        assert(CPathUtils::AdjustForMaxPath(L"c:\\", false) == L"c:\\");
         assert(CPathUtils::AdjustForMaxPath(L"c:\\abcdefghijklmnopqrstuvwxyz\\abcdefghijklmnopqrstuvwxyz\\abcdefghijklmnopqrstuvwxyz\\abcdefghijklmnopqrstuvwxyz\\abcdefghijklmnopqrstuvwxyz\\abcdefghijklmnopqrstuvwxyz\\abcdefghijklmnopqrstuvwxyz\\abcdefghijklmnopqrstuvwxyz\\abcdefghijklmnopqrstuvwxyz\\abcdefghijklmnopqrstuvwxyz") == L"\\\\?\\c:\\abcdefghijklmnopqrstuvwxyz\\abcdefghijklmnopqrstuvwxyz\\abcdefghijklmnopqrstuvwxyz\\abcdefghijklmnopqrstuvwxyz\\abcdefghijklmnopqrstuvwxyz\\abcdefghijklmnopqrstuvwxyz\\abcdefghijklmnopqrstuvwxyz\\abcdefghijklmnopqrstuvwxyz\\abcdefghijklmnopqrstuvwxyz\\abcdefghijklmnopqrstuvwxyz");
         assert(CPathUtils::GetParentDirectory(L"c:\\windows\\system32") == L"c:\\windows");
         assert(CPathUtils::GetParentDirectory(L"c:\\") == L"");

PathUtils.h

@@ -1,6 +1,6 @@
 // sktoolslib - common files for SK tools
 
-// Copyright (C) 2013-2014, 2017, 2020-2021 - Stefan Kueng
+// Copyright (C) 2013-2014, 2017, 2020-2021, 2023 - Stefan Kueng
 
 // This program is free software; you can redistribute it and/or
 // modify it under the terms of the GNU General Public License
@@ -26,7 +26,7 @@ class CPathUtils
 {
 public:
     static std::wstring GetLongPathname(const std::wstring& path);
-    static std::wstring AdjustForMaxPath(const std::wstring& path);
+    static std::wstring AdjustForMaxPath(const std::wstring& path, bool force = true);
 
     static std::wstring GetParentDirectory(const std::wstring& path);
     static std::wstring GetFileExtension(const std::wstring& path);