fix(rust/sedona-raster-gdal,c/sedona-gdal): avoid VSI separator symbol

Author: kontinuation

c/sedona-gdal/src/dyn_load.rs

@@ -157,7 +157,6 @@ fn load_all_symbols(lib: &Library, api: &mut SedonaGdalApi) -> Result<(), GdalIn
     load_fn!(lib, api, VSIFileFromMemBuffer);
     load_fn!(lib, api, VSIFCloseL);
     load_fn!(lib, api, VSIUnlink);
-    load_fn!(lib, api, VSIGetDirectorySeparator);
     load_fn!(lib, api, VSIOpenDir);
     load_fn!(lib, api, VSIGetNextDirEntry);
     load_fn!(lib, api, VSICloseDir);

c/sedona-gdal/src/gdal.rs

@@ -182,12 +182,6 @@ impl Gdal {
         crate::vsi::open_dir(self.api, path, recurse_depth, options)
     }
 
-    /// Return the directory separator used by GDAL for a given VSI path.
-    /// See also [`vsi::get_directory_separator`].
-    pub fn vsi_directory_separator(&self, path: &str) -> Result<String> {
-        crate::vsi::get_directory_separator(self.api, path)
-    }
-
     // -- Raster operations ---------------------------------------------------
 
     /// Create a bare in-memory MEM dataset with GDAL-owned bands.

c/sedona-gdal/src/gdal_dyn_bindgen.rs

@@ -477,8 +477,6 @@ pub(crate) struct SedonaGdalApi {
     >,
     pub VSIFCloseL: Option<unsafe extern "C" fn(fp: VSILFILE) -> c_int>,
     pub VSIUnlink: Option<unsafe extern "C" fn(pszFilename: *const c_char) -> c_int>,
-    pub VSIGetDirectorySeparator:
-        Option<unsafe extern "C" fn(pszPath: *const c_char) -> *const c_char>,
     pub VSIOpenDir: Option<
         unsafe extern "C" fn(
             pszPath: *const c_char,

c/sedona-gdal/src/vsi.rs

@@ -375,17 +375,3 @@ pub fn open_dir(
     }
     Ok(VsiDir { api, handle })
 }
-
-pub fn get_directory_separator(
-    api: &'static crate::gdal_api::GdalApi,
-    path: &str,
-) -> crate::errors::Result<String> {
-    let c_path = std::ffi::CString::new(path)?;
-    let separator_ptr = unsafe { (api.inner.VSIGetDirectorySeparator.unwrap())(c_path.as_ptr()) };
-    if separator_ptr.is_null() {
-        return Err(api.last_null_pointer_err("VSIGetDirectorySeparator"));
-    }
-    Ok(unsafe { std::ffi::CStr::from_ptr(separator_ptr) }
-        .to_string_lossy()
-        .into_owned())
-}

rust/sedona-raster-gdal/src/rs_geotiff_tiles.rs

@@ -428,9 +428,7 @@ fn list_geotiffs(path: &str, recursive: bool) -> Result<Vec<String>> {
 
     let recurse_depth = if recursive { -1 } else { 0 };
     let list_result = with_gdal(|gdal| {
-        let separator = gdal
-            .vsi_directory_separator(&normalized_path)
-            .map_err(convert_gdal_err)?;
+        let separator = directory_separator_for_path(&normalized_path);
         let mut dir = gdal
             .open_vsi_dir(&normalized_path, recurse_depth, None)
             .map_err(convert_gdal_err)?;
@@ -445,7 +443,7 @@ fn list_geotiffs(path: &str, recursive: bool) -> Result<Vec<String>> {
                 continue;
             }
 
-            let child_path = join_vsi_path(&normalized_path, &separator, &entry.name);
+            let child_path = join_vsi_path(&normalized_path, separator, &entry.name);
             if is_geotiff_path_str(&child_path) {
                 out.push(child_path);
             }
@@ -464,6 +462,16 @@ fn list_geotiffs(path: &str, recursive: bool) -> Result<Vec<String>> {
     }
 }
 
+fn directory_separator_for_path(path: &str) -> &'static str {
+    if path.starts_with("/vsi") || path.contains("://") {
+        "/"
+    } else if path.contains('\\') {
+        "\\"
+    } else {
+        "/"
+    }
+}
+
 fn join_vsi_path(base: &str, separator: &str, child_name: &str) -> String {
     if base.ends_with(separator) {
         format!("{base}{child_name}")
@@ -581,6 +589,11 @@ mod tests {
         assert!(is_geotiff_path_str("https://host/data.tif?token=abc#f"));
         assert!(!is_geotiff_path_str("/tmp/a.txt"));
         assert!(!is_geotiff_path_str("/tmp/a"));
+
+        assert_eq!(directory_separator_for_path("/vsis3/bucket/prefix"), "/");
+        assert_eq!(directory_separator_for_path("https://host/data.tif"), "/");
+        assert_eq!(directory_separator_for_path(r"C:\data\dir"), r"\");
+        assert_eq!(directory_separator_for_path("/tmp/data"), "/");
     }
 
     #[tokio::test]