RGBCube/uutils-coreutils
1
Fork 0
mirror of https://github.com/RGBCube/uutils-coreutils synced 2025-07-28 11:37:44 +00:00
Code Issues Activity

split: directory separator in additional suffix

Browse source
This commit is contained in:
zhitkoff 2023-11-02 10:36:15 -04:00 • committed by Sylvestre Ledru
parent f05474a33a
commit 62887c7a58
2 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/uu/split/src/filenames.rs
View file

@ -40,6 +40,7 @@ use crate::{
}; };
use clap::ArgMatches; use clap::ArgMatches;
use std::fmt; use std::fmt;
use std::path::is_separator;
use uucore::display::Quotable; use uucore::display::Quotable;
use uucore::error::{UResult, USimpleError}; use uucore::error::{UResult, USimpleError};
@ -230,7 +231,7 @@ impl Suffix {
.get_one::<String>(OPT_ADDITIONAL_SUFFIX) .get_one::<String>(OPT_ADDITIONAL_SUFFIX)
.unwrap() .unwrap()
.to_string(); .to_string();
if additional.contains('/') || additional.contains('\\') { if additional.chars().any(is_separator) {
return Err(SuffixError::ContainsSeparator(additional)); return Err(SuffixError::ContainsSeparator(additional));
} }

5
tests/by-util/test_split.rs
View file

@ -247,11 +247,14 @@ fn test_split_additional_suffix() {
} }
#[test] #[test]
fn test_additional_suffix_no_slash() { fn test_additional_suffix_dir_separator() {
#[cfg(unix)]
new_ucmd!() new_ucmd!()
.args(&["--additional-suffix", "a/b"]) .args(&["--additional-suffix", "a/b"])
.fails() .fails()
.usage_error("invalid suffix 'a/b', contains directory separator"); .usage_error("invalid suffix 'a/b', contains directory separator");
#[cfg(windows)]
new_ucmd!() new_ucmd!()
.args(&["--additional-suffix", "a\\b"]) .args(&["--additional-suffix", "a\\b"])
.fails() .fails()