Mirrors/coreutils
2
0
Fork 0
mirror of https://github.com/uutils/coreutils synced 2024-12-13 23:02:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

parse_size,dd: turn instance fns to associated fns

Browse source
This commit is contained in:
Daniel Hofstetter 2023-08-26 14:35:35 +02:00
parent f0602b0ce6
commit 2e2387d434
2 changed files with 16 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/uu/dd/src/parseargs.rs
View file

@ -245,29 +245,29 @@ impl Parser {
None => return Err(ParseError::UnrecognizedOperand(operand.to_string())),
Some((k, v)) => match k {
"bs" => {
let bs = self.parse_bytes(k, v)?;
let bs = Self::parse_bytes(k, v)?;
self.ibs = bs;
self.obs = bs;
}
"cbs" => self.cbs = Some(self.parse_bytes(k, v)?),
"cbs" => self.cbs = Some(Self::parse_bytes(k, v)?),
"conv" => self.parse_conv_flags(v)?,
"count" => self.count = Some(self.parse_n(v)?),
"ibs" => self.ibs = self.parse_bytes(k, v)?,
"count" => self.count = Some(Self::parse_n(v)?),
"ibs" => self.ibs = Self::parse_bytes(k, v)?,
"if" => self.infile = Some(v.to_string()),
"iflag" => self.parse_input_flags(v)?,
"obs" => self.obs = self.parse_bytes(k, v)?,
"obs" => self.obs = Self::parse_bytes(k, v)?,
"of" => self.outfile = Some(v.to_string()),
"oflag" => self.parse_output_flags(v)?,
"seek" | "oseek" => self.seek = self.parse_n(v)?,
"skip" | "iseek" => self.skip = self.parse_n(v)?,
"status" => self.status = Some(self.parse_status_level(v)?),
"seek" | "oseek" => self.seek = Self::parse_n(v)?,
"skip" | "iseek" => self.skip = Self::parse_n(v)?,
"status" => self.status = Some(Self::parse_status_level(v)?),
_ => return Err(ParseError::UnrecognizedOperand(operand.to_string())),
},
}
Ok(())
}
fn parse_n(&self, val: &str) -> Result<Num, ParseError> {
fn parse_n(val: &str) -> Result<Num, ParseError> {
let n = parse_bytes_with_opt_multiplier(val)?;
Ok(if val.ends_with('B') {
Num::Bytes(n)
@ -276,13 +276,13 @@ impl Parser {
})
}
fn parse_bytes(&self, arg: &str, val: &str) -> Result<usize, ParseError> {
fn parse_bytes(arg: &str, val: &str) -> Result<usize, ParseError> {
parse_bytes_with_opt_multiplier(val)?
.try_into()
.map_err(|_| ParseError::BsOutOfRange(arg.to_string()))
}
fn parse_status_level(&self, val: &str) -> Result<StatusLevel, ParseError> {
fn parse_status_level(val: &str) -> Result<StatusLevel, ParseError> {
match val {
"none" => Ok(StatusLevel::None),
"noxfer" => Ok(StatusLevel::Noxfer),

11
src/uucore/src/lib/parser/parse_size.rs
View file

@ -75,7 +75,7 @@ impl<'parser> Parser<'parser> {
return Err(ParseSizeError::parse_failure(size));
}
let number_system: NumberSystem = self.determine_number_system(size);
let number_system = Self::determine_number_system(size);
// Split the size argument into numeric and unit parts
// For example, if the argument is "123K", the numeric part is "123", and
@ -156,16 +156,16 @@ impl<'parser> Parser<'parser> {
if numeric_string.is_empty() {
1
} else {
self.parse_number(&numeric_string, 10, size)?
Self::parse_number(&numeric_string, 10, size)?
}
}
NumberSystem::Octal => {
let trimmed_string = numeric_string.trim_start_matches('0');
self.parse_number(trimmed_string, 8, size)?
Self::parse_number(trimmed_string, 8, size)?
}
NumberSystem::Hexadecimal => {
let trimmed_string = numeric_string.trim_start_matches("0x");
self.parse_number(trimmed_string, 16, size)?
Self::parse_number(trimmed_string, 16, size)?
}
};
@ -174,7 +174,7 @@ impl<'parser> Parser<'parser> {
.ok_or_else(|| ParseSizeError::size_too_big(size))
}
fn determine_number_system(&self, size: &str) -> NumberSystem {
fn determine_number_system(size: &str) -> NumberSystem {
if size.len() <= 1 {
return NumberSystem::Decimal;
}
@ -197,7 +197,6 @@ impl<'parser> Parser<'parser> {
}
fn parse_number(
&self,
numeric_string: &str,
radix: u32,
original_size: &str,