From e5c19734c8a3d7f3b94a25887149b261ccffd1a8 Mon Sep 17 00:00:00 2001 From: electricboogie <32370782+electricboogie@users.noreply.github.com> Date: Sun, 25 Apr 2021 21:38:22 -0500 Subject: [PATCH] Change Default Buffer to usize::MAX --- src/uu/sort/src/sort.rs | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/uu/sort/src/sort.rs b/src/uu/sort/src/sort.rs index aa2e1bfe7..55362d4ad 100644 --- a/src/uu/sort/src/sort.rs +++ b/src/uu/sort/src/sort.rs @@ -93,8 +93,7 @@ static NEGATIVE: char = '-'; static POSITIVE: char = '+'; static DEFAULT_TMPDIR: &str = r"/tmp"; -// 4GB buffer for Vec before we dump to disk, never used -static DEFAULT_BUF_SIZE: usize = 4000000000; +static DEFAULT_BUF_SIZE: usize = usize::MAX; #[derive(Eq, Ord, PartialEq, PartialOrd, Clone, Copy)] enum SortMode { @@ -142,11 +141,11 @@ impl GlobalSettings { let suf_usize: usize = match suf_str.to_uppercase().as_str() { // SI Units "B" => 1usize, - "K" => 1024usize, - "M" => 1024000usize, - "G" => 1024000000usize, - // GNU regards empty human numeric value as 1024 bytes - _ => 1024usize, + "K" => 1000usize, + "M" => 1000000usize, + "G" => 1000000000usize, + // GNU regards empty human numeric values as K by default + _ => 1000usize, }; num_usize * suf_usize }