1
Fork 0
mirror of https://github.com/RGBCube/uutils-coreutils synced 2025-07-30 20:47:46 +00:00

Merge pull request #5504 from cakebaker/du_use_blocks

du: use blocks to remove some cfgs
This commit is contained in:
Terts Diepraam 2023-11-07 12:03:41 +01:00 committed by GitHub
commit 188b26e8aa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -137,12 +137,13 @@ impl Stat {
}?; }?;
#[cfg(not(windows))] #[cfg(not(windows))]
{
let file_info = FileInfo { let file_info = FileInfo {
file_id: metadata.ino() as u128, file_id: metadata.ino() as u128,
dev_id: metadata.dev(), dev_id: metadata.dev(),
}; };
#[cfg(not(windows))]
return Ok(Self { Ok(Self {
path: path.to_path_buf(), path: path.to_path_buf(),
is_dir: metadata.is_dir(), is_dir: metadata.is_dir(),
size: if path.is_dir() { 0 } else { metadata.len() }, size: if path.is_dir() { 0 } else { metadata.len() },
@ -152,25 +153,27 @@ impl Stat {
created: birth_u64(&metadata), created: birth_u64(&metadata),
accessed: metadata.atime() as u64, accessed: metadata.atime() as u64,
modified: metadata.mtime() as u64, modified: metadata.mtime() as u64,
}); })
}
#[cfg(windows)] #[cfg(windows)]
{
let size_on_disk = get_size_on_disk(path); let size_on_disk = get_size_on_disk(path);
#[cfg(windows)]
let file_info = get_file_info(path); let file_info = get_file_info(path);
#[cfg(windows)]
Ok(Self { Ok(Self {
path: path.to_path_buf(), path: path.to_path_buf(),
is_dir: metadata.is_dir(), is_dir: metadata.is_dir(),
size: if path.is_dir() { 0 } else { metadata.len() }, size: if path.is_dir() { 0 } else { metadata.len() },
blocks: size_on_disk / 1024 * 2, blocks: size_on_disk / 1024 * 2,
inode: file_info,
inodes: 1, inodes: 1,
inode: file_info,
created: windows_creation_time_to_unix_time(metadata.creation_time()), created: windows_creation_time_to_unix_time(metadata.creation_time()),
accessed: windows_time_to_unix_time(metadata.last_access_time()), accessed: windows_time_to_unix_time(metadata.last_access_time()),
modified: windows_time_to_unix_time(metadata.last_write_time()), modified: windows_time_to_unix_time(metadata.last_write_time()),
}) })
} }
}
} }
#[cfg(windows)] #[cfg(windows)]