RGBCube/uutils-coreutils
1
Fork 0
mirror of https://github.com/RGBCube/uutils-coreutils synced 2025-08-04 06:57:47 +00:00
Code Issues Activity

Merge pull request #1057 from ids1024/ls

Browse source 
Fix ordering of ls -t, which was backwards
This commit is contained in:
Alex Lyon 2017-07-26 21:18:00 -07:00 • committed by GitHub
commit 4a5b76f678
1 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/ls/ls.rs
View file

@ -31,6 +31,7 @@ use std::fs;
use std::fs::{DirEntry, FileType, Metadata}; use std::fs::{DirEntry, FileType, Metadata};
use std::path::{Path, PathBuf}; use std::path::{Path, PathBuf};
use std::io::Write; use std::io::Write;
use std::cmp::Reverse;
#[cfg(unix)] #[cfg(unix)]
use std::collections::HashMap; use std::collections::HashMap;
@ -191,9 +192,10 @@ fn sort_entries(entries: &mut Vec<PathBuf>, options: &getopts::Matches) {
entries.sort_by_key(|k| get_metadata(k, options).map(|md| md.ctime()).unwrap_or(0)); entries.sort_by_key(|k| get_metadata(k, options).map(|md| md.ctime()).unwrap_or(0));
} else { } else {
entries.sort_by_key(|k| { entries.sort_by_key(|k| {
get_metadata(k, options) // Newest first
Reverse(get_metadata(k, options)
.and_then(|md| md.modified()) .and_then(|md| md.modified())
.unwrap_or(std::time::UNIX_EPOCH) .unwrap_or(std::time::UNIX_EPOCH))
}); });
} }
} else if options.opt_present("S") { } else if options.opt_present("S") {
@ -213,9 +215,10 @@ fn sort_entries(entries: &mut Vec<PathBuf>, options: &getopts::Matches) {
let mut reverse = options.opt_present("r"); let mut reverse = options.opt_present("r");
if options.opt_present("t") { if options.opt_present("t") {
entries.sort_by_key(|k| { entries.sort_by_key(|k| {
get_metadata(k, options) // Newest first
Reverse(get_metadata(k, options)
.and_then(|md| md.modified()) .and_then(|md| md.modified())
.unwrap_or(std::time::UNIX_EPOCH) .unwrap_or(std::time::UNIX_EPOCH))
}); });
} else if options.opt_present("S") { } else if options.opt_present("S") {
entries.sort_by_key(|k| get_metadata(k, options).map(|md| md.file_size()).unwrap_or(0)); entries.sort_by_key(|k| get_metadata(k, options).map(|md| md.file_size()).unwrap_or(0));