gsadmin/rustfs
1
0
Fork 0
mirror of https://github.com/rustfs/rustfs.git synced 2026-08-05 04:47:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(windows): handle zfs volume paths (#3157)

Browse Source 
* fix(windows): handle zfs volume paths

* fix(windows): address volume path review

* refactor(windows): share fallback path resolution

---------

Co-authored-by: houseme <housemecn@gmail.com>
This commit is contained in:
cxymds
2026-06-01 21:04:40 +08:00
committed by GitHub
parent e91e513ab3
commit 39a283fbce
4 changed files with 128 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/utils/src/string.rs
+27 -2
View File
@@ -423,9 +423,30 @@ pub fn find_ellipses_patterns(arg: &str) -> Result<ArgPattern> {
/// ```
///
pub fn has_ellipses<T: AsRef<str>>(s: &[T]) -> bool {
let pattern = [ELLIPSES, OPEN_BRACES, CLOSE_BRACES];
s.iter().any(|v| {
let v = v.as_ref();
s.iter().any(|v| pattern.iter().any(|p| v.as_ref().contains(p)))
let mut remaining = v;
while let Some(start) = remaining.find(OPEN_BRACES) {
let after_start = &remaining[start + OPEN_BRACES.len()..];
let Some(end) = after_start.find(CLOSE_BRACES) else {
break;
};
// Dotted brace content covers both valid ellipsis patterns like
// {1...64} and invalid attempts like {1..64}, while excluding
// Windows Volume{GUID} paths (GUIDs use hyphens, not dots).
if after_start[..end].contains('.') {
return true;
}
remaining = &after_start[end + CLOSE_BRACES.len()..];
}
// Bare `...` without braces (e.g. "1...64") is still an ellipsis attempt.
if v.contains(ELLIPSES) {
return true;
}
false
})
}
/// Parses an ellipses range pattern of following style
@@ -569,6 +590,10 @@ mod tests {
),
(15, vec!["mydisk-{a...z}{1...20}"], true),
(16, vec!["mydisk-{1...4}{1..2.}"], true),
// Windows Volume{GUID} paths must not match; GUIDs use hyphens, not dots.
(17, vec![r"\\?\Volume{9425a190-4bb3-11f1-86de-803253b6a8b8}\"], false),
(18, vec![r"//./Volume{9425a190-4bb3-11f1-86de-803253b6a8b8}/"], false),
(19, vec![r"\\?\Volume{9425a190-4bb3-11f1-86de-803253b6a8b8}\disk-{1..4}"], true),
];
for (i, args, expected) in test_cases {