Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/uu/df/src/df.rs
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,7 @@ impl Options {
),
ParseSizeError::ParseFailure(s) => OptionsError::InvalidBlockSize(s),
ParseSizeError::PhysicalMem(s) => OptionsError::InvalidBlockSize(s),
ParseSizeError::BuilderConfig(e) => OptionsError::InvalidBlockSize(e.to_string()),
})?,
header_mode: {
if matches.get_flag(OPT_HUMAN_READABLE_BINARY)
Expand Down
1 change: 1 addition & 0 deletions src/uu/du/locales/en-US.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ du-error-printing-thread-panicked = Printing thread panicked.
du-error-invalid-suffix = invalid suffix in --{ $option } argument { $value }
du-error-invalid-argument = invalid --{ $option } argument { $value }
du-error-argument-too-large = --{ $option } argument { $value } too large
du-error-invalid-configuration = invalid configuration for --{ $option }: { $error }
du-error-hyphen-file-name-not-allowed = when reading file names from standard input, no file name of '-' allowed

# Verbose/status messages
Expand Down
1 change: 1 addition & 0 deletions src/uu/du/locales/fr-FR.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ du-error-printing-thread-panicked = Le thread d'affichage a paniqué.
du-error-invalid-suffix = suffixe invalide dans l'argument --{ $option } { $value }
du-error-invalid-argument = argument --{ $option } invalide { $value }
du-error-argument-too-large = argument --{ $option } { $value } trop grand
du-error-invalid-configuration = configuration invalide pour --{ $option }: { $error }
du-error-hyphen-file-name-not-allowed = le nom de fichier '-' n'est pas autorisé lors de la lecture de l'entrée standard

# Messages verbeux/de statut
Expand Down
3 changes: 3 additions & 0 deletions src/uu/du/src/du.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1490,6 +1490,9 @@ fn format_error_message(error: &ParseSizeError, s: &str, option: &str) -> String
ParseSizeError::SizeTooBig(_) => {
translate!("du-error-argument-too-large", "option" => option, "value" => s.quote())
}
ParseSizeError::BuilderConfig(e) => {
translate!("du-error-invalid-configuration", "option" => option, "error" => e.to_string())
}
}
}

Expand Down
1 change: 1 addition & 0 deletions src/uu/od/locales/en-US.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ od-error-overflow = Numerical result out of range
od-error-invalid-suffix = invalid suffix in {$option} argument {$value}
od-error-invalid-argument = invalid {$option} argument {$value}
od-error-argument-too-large = {$option} argument {$value} too large
od-error-invalid-configuration = invalid configuration for {$option}: {$error}
od-error-skip-past-end = tried to skip past end of input

# Help messages
Expand Down
1 change: 1 addition & 0 deletions src/uu/od/locales/fr-FR.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ od-error-parse-failed = échec de l'analyse
od-error-invalid-suffix = suffixe invalide dans l'argument {$option} {$value}
od-error-invalid-argument = argument {$option} invalide {$value}
od-error-argument-too-large = argument {$option} {$value} trop grand
od-error-invalid-configuration = configuration invalide pour {$option}: {$error}
od-error-skip-past-end = tentative d'ignorer au-delà de la fin de l'entrée

# Messages d'aide
Expand Down
3 changes: 3 additions & 0 deletions src/uu/od/src/od.rs
Original file line number Diff line number Diff line change
Expand Up @@ -804,5 +804,8 @@ fn format_error_message(error: &ParseSizeError, s: &str, option: &str) -> String
ParseSizeError::SizeTooBig(_) => {
translate!("od-error-argument-too-large", "option" => option, "value" => s.quote())
}
ParseSizeError::BuilderConfig(e) => {
translate!("od-error-invalid-configuration", "option" => option, "error" => e.to_string())
}
}
}
10 changes: 7 additions & 3 deletions src/uu/sort/src/sort.rs
Original file line number Diff line number Diff line change
Expand Up @@ -317,12 +317,13 @@ impl GlobalSettings {
fn parse_byte_count(input: &str) -> Result<usize, ParseSizeError> {
// GNU sort (8.32) valid: 1b, k, K, m, M, g, G, t, T, P, E, Z, Y
// GNU sort (8.32) invalid: b, B, 1B, p, e, z, y
// Note: "%" is also valid for percentage-based memory allocation on Unix-like systems
let size = Parser::default()
.with_allow_list(&[
"b", "k", "K", "m", "M", "g", "G", "t", "T", "P", "E", "Z", "Y", "R", "Q", "%",
])
.with_default_unit("K")
.with_b_byte_count(true)
])?
.with_default_unit("K")?
.with_b_byte_count(true)?
.parse(input.trim())?;

usize::try_from(size).map_err(|_| {
Expand Down Expand Up @@ -2268,6 +2269,9 @@ fn format_error_message(error: &ParseSizeError, s: &str, option: &str) -> String
ParseSizeError::SizeTooBig(_) => {
translate!("sort-option-arg-too-large", "option" => option, "arg" => s.quote())
}
ParseSizeError::BuilderConfig(e) => {
format!("invalid configuration for {option}: {e}")
}
}
}

Expand Down
Loading
Loading