RGBCube/uutils-coreutils
1
Fork 0
mirror of https://github.com/RGBCube/uutils-coreutils synced 2025-07-29 12:07:46 +00:00
Code Issues Activity

Possible fix to Windows issues, ext_sort bool setting

Browse source
This commit is contained in:
electricboogie 2021-04-26 08:54:40 -05:00
parent c01c6a7d78
commit f3ed5a100f
1 changed files with 9 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/uu/sort/src/sort.rs
View file

@ -32,7 +32,6 @@ use smallvec::SmallVec;
use std::cmp::Ordering; use std::cmp::Ordering;
use std::collections::BinaryHeap; use std::collections::BinaryHeap;
use std::env; use std::env;
use std::ffi::OsString;
use std::fs::File; use std::fs::File;
use std::hash::{Hash, Hasher}; use std::hash::{Hash, Hasher};
use std::io::{stdin, stdout, BufRead, BufReader, BufWriter, Lines, Read, Write}; use std::io::{stdin, stdout, BufRead, BufReader, BufWriter, Lines, Read, Write};
@ -98,7 +97,7 @@ static DEFAULT_TMPDIR: &str = r"%USERPROFILE%\AppData\Local\Temp";
#[cfg(not(any(target_os = "windows",)))] #[cfg(not(any(target_os = "windows",)))]
static DEFAULT_TMPDIR: &str = r"/tmp"; static DEFAULT_TMPDIR: &str = r"/tmp";
static DEFAULT_BUF_SIZE: usize = usize::MAX; static DEFAULT_BUF_SIZE: usize = std::usize::MAX;
#[derive(Eq, Ord, PartialEq, PartialOrd, Clone, Copy)] #[derive(Eq, Ord, PartialEq, PartialOrd, Clone, Copy)]
enum SortMode { enum SortMode {
@ -132,6 +131,7 @@ struct GlobalSettings {
zero_terminated: bool, zero_terminated: bool,
buffer_size: usize, buffer_size: usize,
tmp_dir: PathBuf, tmp_dir: PathBuf,
ext_sort: bool,
} }
impl GlobalSettings { impl GlobalSettings {
@ -180,6 +180,7 @@ impl Default for GlobalSettings {
zero_terminated: false, zero_terminated: false,
buffer_size: DEFAULT_BUF_SIZE, buffer_size: DEFAULT_BUF_SIZE,
tmp_dir: PathBuf::from(DEFAULT_TMPDIR), tmp_dir: PathBuf::from(DEFAULT_TMPDIR),
ext_sort: false,
} }
} }
} }
@ -328,9 +329,7 @@ impl Line {
); );
range.shorten(num_range); range.shorten(num_range);
NumCache::WithInfo(info) NumCache::WithInfo(info)
} else if selector.settings.mode == SortMode::GeneralNumeric } else if selector.settings.mode == SortMode::GeneralNumeric {
&& settings.buffer_size == DEFAULT_BUF_SIZE
{
let str = range.get_str(&line); let str = range.get_str(&line);
NumCache::AsF64(general_f64_parse(&str[get_leading_gen(str)])) NumCache::AsF64(general_f64_parse(&str[get_leading_gen(str)]))
} else { } else {
@ -1057,7 +1056,8 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
.unwrap_or(format!("{}", DEFAULT_BUF_SIZE)); .unwrap_or(format!("{}", DEFAULT_BUF_SIZE));
GlobalSettings::human_numeric_convert(&input) GlobalSettings::human_numeric_convert(&input)
} };
settings.ext_sort = true;
} }
if matches.is_present(OPT_TMP_DIR) { if matches.is_present(OPT_TMP_DIR) {
@ -1066,17 +1066,9 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
.map(String::from) .map(String::from)
.unwrap_or(DEFAULT_TMPDIR.to_owned()); .unwrap_or(DEFAULT_TMPDIR.to_owned());
settings.tmp_dir = PathBuf::from(result); settings.tmp_dir = PathBuf::from(result);
settings.ext_sort = true;
} else { } else {
for (key, value) in env::vars_os() { settings.tmp_dir = env::temp_dir();
if key == OsString::from("TMPDIR")
|| key == OsString::from("TEMP")
|| key == OsString::from("TMP")
{
settings.tmp_dir = PathBuf::from(value);
break;
}
settings.tmp_dir = PathBuf::from(DEFAULT_TMPDIR);
}
} }
settings.zero_terminated = matches.is_present(OPT_ZERO_TERMINATED); settings.zero_terminated = matches.is_present(OPT_ZERO_TERMINATED);
@ -1207,7 +1199,7 @@ fn exec(files: Vec<String>, settings: GlobalSettings) -> i32 {
// Only use ext_sorter when we need to. // Only use ext_sorter when we need to.
// Probably faster that we don't create // Probably faster that we don't create
// an owned value each run // an owned value each run
if settings.buffer_size != DEFAULT_BUF_SIZE { if settings.ext_sort {
lines = ext_sort_by(lines, settings.clone()); lines = ext_sort_by(lines, settings.clone());
} else { } else {
sort_by(&mut lines, &settings); sort_by(&mut lines, &settings);