Factor out system path code

amoeba · amoeba · commit 8141e58e5361 · 2025-08-08T14:48:52.000-07:00
diff --git a/rust/driver_manager/src/lib.rs b/rust/driver_manager/src/lib.rs
@@ -1753,6 +1753,18 @@ fn user_config_dir() -> Option<PathBuf> {
     }
 }
 
+fn system_config_dir() -> Option<PathBuf> {
+    #[cfg(target_os = "macos")]
+    {
+        Some(PathBuf::from("/Library/Application Support/ADBC"))
+    }
+
+    #[cfg(all(unix, not(target_os = "macos")))]
+    {
+        Some(PathBuf::from("/etc/adbc"))
+    }
+}
+
 fn get_search_paths(lvls: LoadFlags) -> Vec<PathBuf> {
     let mut result = Vec::new();
     if lvls & LOAD_FLAG_SEARCH_ENV != 0 {
@@ -1774,13 +1786,10 @@ fn get_search_paths(lvls: LoadFlags) -> Vec<PathBuf> {
     // system level for windows is to search the registry keys
     #[cfg(not(windows))]
     if lvls & LOAD_FLAG_SEARCH_SYSTEM != 0 {
-        #[cfg(target_os = "macos")]
-        let system_config_dir = PathBuf::from("/Library/Application Support/ADBC");
-        #[cfg(not(target_os = "macos"))]
-        let system_config_dir = PathBuf::from("/etc/adbc");
-
-        if system_config_dir.exists() {
-            result.push(system_config_dir);
+        if let Some(path) = system_config_dir() {
+            if path.exists() {
+                result.push(path);
+            }
         }
     }
 
