Skip to content

ls: use libc::{major, minor} to calculate device number #4120

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sylvestre merged 2 commits into from
Nov 9, 2022
Merged

ls: use libc::{major, minor} to calculate device number #4120

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2bb75a9
ls: use libc::{major, minor} to calculate device number
SteveLauC Nov 9, 2022
7f7bac2
ls: use libc::{major, minor} to calculate device number
SteveLauC Nov 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 19 additions & 16 deletions src/uu/ls/src/ls.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,13 @@ use std::{
};
use term_grid::{Cell, Direction, Filling, Grid, GridOptions};
use unicode_width::UnicodeWidthStr;
#[cfg(any(
target_os = "linux",
target_os = "macos",
target_os = "android",
target_os = "ios"
))]
use uucore::libc::{dev_t, major, minor};
#[cfg(unix)]
use uucore::libc::{S_IXGRP, S_IXOTH, S_IXUSR};
use uucore::parse_glob;
Expand All @@ -63,7 +70,6 @@ Ignore files and directories starting with a '.' by default"#;
const USAGE: &str = "{} [OPTION]... [FILE]...";

pub mod options {

pub mod format {
pub static ONE_LINE: &str = "1";
pub static LONG: &str = "long";
Expand Down Expand Up @@ -354,6 +360,7 @@ fn parse_time_style(options: &clap::ArgMatches) -> Result<TimeStyle, LsError> {
Ok(TimeStyle::Locale)
}
}

enum Dereference {
None,
DirArgs,
Expand Down Expand Up @@ -2383,7 +2390,7 @@ fn display_item_long(
padding
.size
.saturating_sub(padding.minor.saturating_add(2usize))
)
),
),
pad_left(
&minor,
Expand Down Expand Up @@ -2643,23 +2650,19 @@ enum SizeOrDeviceId {
}

fn display_len_or_rdev(metadata: &Metadata, config: &Config) -> SizeOrDeviceId {
#[cfg(any(target_os = "macos", target_os = "ios"))]
{
let ft = metadata.file_type();
if ft.is_char_device() || ft.is_block_device() {
let dev: u64 = metadata.rdev();
let major = (dev >> 24) as u8;
let minor = (dev & 0xff) as u8;
return SizeOrDeviceId::Device(major.to_string(), minor.to_string());
}
}
#[cfg(any(target_os = "linux", target_os = "android"))]
#[cfg(any(
target_os = "linux",
target_os = "macos",
target_os = "android",
target_os = "ios"
))]
{
let ft = metadata.file_type();
if ft.is_char_device() || ft.is_block_device() {
let dev: u64 = metadata.rdev();
let major = (dev >> 8) as u8;
let minor = (dev & 0xff) as u8;
// A type cast is needed here as the `dev_t` type varies across OSes.
let dev = metadata.rdev() as dev_t;
let major = unsafe { major(dev) };
let minor = unsafe { minor(dev) };
return SizeOrDeviceId::Device(major.to_string(), minor.to_string());
}
}
Expand Down