Hotfix for #66273 (#66287)

* Append a path delimiter for the 'dot' directory. * Update src/filesystem.cpp Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
CleverRaven · Jun 18, 2023 · c3e2de8 · c3e2de8
1 parent f771f3b
commit c3e2de8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/filesystem.cpp b/src/filesystem.cpp
@@ -82,7 +82,11 @@ std::string as_norm_dir( const std::string &path )
 {
     fs::path dir = fs::u8path( path ) / fs::path{};
     fs::path norm = dir.lexically_normal();
-    return norm.generic_u8string();
+    std::string ret = norm.generic_u8string();
+    if( "." == ret ) {
+        ret = "./"; // TODO Change the many places that use strings instead of paths
+    }
+    return ret;
 }
 
 std::string as_norm_dir( const fs::path &path )

diff --git a/src/main.cpp b/src/main.cpp
@@ -654,7 +654,7 @@ int main( int argc, const char *argv[] )
 #   if defined(USE_HOME_DIR) || defined(USE_XDG_DIR)
     PATH_INFO::init_user_dir( "" );
 #   else
-    PATH_INFO::init_user_dir( "./" );
+    PATH_INFO::init_user_dir( "." );
 #   endif
 #endif
     PATH_INFO::set_standard_filenames();