Merge pull request #197 from rust-embedded/slash

escape on match

Author: Emilgardis

CHANGELOG-rust.md

@@ -5,6 +5,8 @@ This changelog tracks the Rust `svdtools` project. See
 
 ## [Unreleased]
 
+* Fix escape special characters on Windows 
+
 ## [v0.3.8] 2023-12-23
 
 * Fix #176 in `collect_in_cluster`

Cargo.toml

@@ -38,7 +38,7 @@ serde_json = { version = "1.0", features = ["preserve_order"] }
 anyhow = "1.0.65"
 thiserror = "1.0.35"
 linked-hash-map = "0.5"
-globset = "0.4.8"
+globset = "0.4.14"
 commands = "0.0.5"
 env_logger = "0.10"
 log = { version = "~0.4", features = ["std"] }

src/patch/mod.rs

@@ -1,6 +1,5 @@
 pub mod patch_cli;
 
-use globset::Glob;
 use std::fs::File;
 use std::io::{Read, Write};
 use std::path::{Path, PathBuf};
@@ -248,19 +247,27 @@ fn matchname(name: &str, spec: &str) -> bool {
     matchsubspec(name, spec).is_some()
 }
 
+fn newglob(spec: &str) -> globset::GlobMatcher {
+    globset::GlobBuilder::new(spec)
+        .backslash_escape(true)
+        .build()
+        .unwrap()
+        .compile_matcher()
+}
+
 /// If a name matches a specification, return the first sub-specification that it matches
 fn matchsubspec<'a>(name: &str, spec: &'a str) -> Option<&'a str> {
     if spec.starts_with('_') {
         return None;
     }
     if spec.contains('{') {
-        let glob = Glob::new(spec).unwrap().compile_matcher();
+        let glob = newglob(spec);
         if glob.is_match(name) {
             return Some(spec);
         }
     } else {
         for subspec in spec.split(',') {
-            let glob = Glob::new(subspec).unwrap().compile_matcher();
+            let glob = newglob(subspec);
             if glob.is_match(name) {
                 return Some(subspec);
             }