Mirrors/nushell
2
0
Fork 0
mirror of https://github.com/nushell/nushell synced 2024-11-14 00:47:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

use constant instead of <0 for ls fix (#11642)

Browse source 
https://github.com/nushell/nushell/pull/10558#issuecomment-1911076784

more correct than <0.  safer check.
This commit is contained in:
David Horner 2024-01-29 14:17:04 -05:00 committed by GitHub
parent 86dd045554
commit 14e4d05a9f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
crates/nu-command/src/filesystem/ls.rs
View file

@ -632,7 +632,9 @@ fn try_convert_to_local_date_time(t: SystemTime) -> Option<DateTime<Local>> {
}
};
if sec < 0 {
const NEG_UNIX_EPOCH: i64 = -11644473600; // t was invalid 0, UNIX_EPOCH subtracted above.
if sec == NEG_UNIX_EPOCH {
// do not tz lookup invalid SystemTime
return None;
}
match Utc.timestamp_opt(sec, nsec) {
@ -680,14 +682,10 @@ mod windows_helper {
let find_data = match find_first_file(filename, span) {
Ok(fd) => fd,
Err(e) => {
// Sometimes this happens when the file name is not allowed on Windows (ex: ends with a '.')
// Sometimes this happens when the file name is not allowed on Windows (ex: ends with a '.', pipes)
// For now, we just log it and give up on returning metadata columns
// TODO: find another way to get this data (like cmd.exe, pwsh, and MINGW bash can)
// eprintln!(
// "Failed to read metadata for '{}'. It may have an illegal filename",
// filename.to_string_lossy()
// );
log::error!("ls: {e}");
log::error!("ls: '{}' {}", filename.to_string_lossy(), e);
return Value::record(record, span);
}
};