VSIReadDirRecursive(): make it work properly with a trailing slash (e…

…specially on /vsizip/) (fixes OSGeo#8474)
koordinates · Sep 25, 2023 · 5f19ff9 · 5f19ff9
1 parent bb5dfb5
commit 5f19ff9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/autotest/gcore/vsizip.py b/autotest/gcore/vsizip.py
@@ -270,6 +270,9 @@ def test_vsizip_4():
         "uint16.tif",
     ], "bad content"
 
+    # Test with trailing slash too
+    assert gdal.ReadDirRecursive("/vsizip/data/testzip.zip/") == res
+
 
 ###############################################################################
 # Test ReadRecursive on deep zip

diff --git a/port/cpl_vsil.cpp b/port/cpl_vsil.cpp
@@ -1455,6 +1455,9 @@ VSIDIR *VSIFilesystemHandler::OpenDir(const char *pszPath, int nRecurseDepth,
     }
     VSIDIRGeneric *dir = new VSIDIRGeneric(this);
     dir->osRootPath = pszPath;
+    if (!dir->osRootPath.empty() &&
+        (dir->osRootPath.back() == '/' || dir->osRootPath.back() == '\\'))
+        dir->osRootPath.pop_back();
     dir->nRecurseDepth = nRecurseDepth;
     dir->papszContent = papszContent;
     dir->m_osFilterPrefix = CSLFetchNameValueDef(papszOptions, "PREFIX", "");