RGBCube/uutils-coreutils
1
Fork 0
mirror of https://github.com/RGBCube/uutils-coreutils synced 2025-07-28 03:27:44 +00:00
Code Issues Activity

refactor/uname ~ rename vars to standards

Browse source
This commit is contained in:
Roy Ivy III 2023-01-12 11:12:32 -06:00
parent 759f32fe4f
commit ead457171b
1 changed files with 24 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

48
src/uu/uname/src/uname.rs
View file

@ -23,13 +23,13 @@ const USAGE: &str = "{} [OPTION]...";
pub mod options { pub mod options {
pub static ALL: &str = "all"; pub static ALL: &str = "all";
pub static KERNELNAME: &str = "kernel-name"; pub static KERNEL_NAME: &str = "kernel-name";
pub static NODENAME: &str = "nodename"; pub static NODENAME: &str = "nodename";
pub static KERNELVERSION: &str = "kernel-version"; pub static KERNEL_VERSION: &str = "kernel-version";
pub static KERNELRELEASE: &str = "kernel-release"; pub static KERNEL_RELEASE: &str = "kernel-release";
pub static MACHINE: &str = "machine"; pub static MACHINE: &str = "machine";
pub static PROCESSOR: &str = "processor"; pub static PROCESSOR: &str = "processor";
pub static HWPLATFORM: &str = "hardware-platform"; pub static HARDWARE_PLATFORM: &str = "hardware-platform";
pub static OS: &str = "operating-system"; pub static OS: &str = "operating-system";
} }
@ -42,26 +42,26 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
let mut output = String::new(); let mut output = String::new();
let all = matches.get_flag(options::ALL); let all = matches.get_flag(options::ALL);
let kernelname = matches.get_flag(options::KERNELNAME); let kernel_name = matches.get_flag(options::KERNEL_NAME);
let nodename = matches.get_flag(options::NODENAME); let nodename = matches.get_flag(options::NODENAME);
let kernelrelease = matches.get_flag(options::KERNELRELEASE); let kernel_release = matches.get_flag(options::KERNEL_RELEASE);
let kernelversion = matches.get_flag(options::KERNELVERSION); let kernel_version = matches.get_flag(options::KERNEL_VERSION);
let machine = matches.get_flag(options::MACHINE); let machine = matches.get_flag(options::MACHINE);
let processor = matches.get_flag(options::PROCESSOR); let processor = matches.get_flag(options::PROCESSOR);
let hwplatform = matches.get_flag(options::HWPLATFORM); let hardware_platform = matches.get_flag(options::HARDWARE_PLATFORM);
let os = matches.get_flag(options::OS); let os = matches.get_flag(options::OS);
let none = !(all let none = !(all
|| kernelname || kernel_name
|| nodename || nodename
|| kernelrelease || kernel_release
|| kernelversion || kernel_version
|| machine || machine
|| os || os
|| processor || processor
|| hwplatform); || hardware_platform);
if kernelname || all || none { if kernel_name || all || none {
output.push_str(&uname.sysname()); output.push_str(&uname.sysname());
output.push(' '); output.push(' ');
} }
@ -72,12 +72,12 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
output.push(' '); output.push(' ');
} }
if kernelrelease || all { if kernel_release || all {
output.push_str(&uname.release()); output.push_str(&uname.release());
output.push(' '); output.push(' ');
} }
if kernelversion || all { if kernel_version || all {
output.push_str(&uname.version()); output.push_str(&uname.version());
output.push(' '); output.push(' ');
} }
@ -101,7 +101,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
// This option is unsupported on modern Linux systems // This option is unsupported on modern Linux systems
// See: https://lists.gnu.org/archive/html/bug-coreutils/2005-09/msg00063.html // See: https://lists.gnu.org/archive/html/bug-coreutils/2005-09/msg00063.html
if hwplatform { if hardware_platform {
output.push_str("unknown"); output.push_str("unknown");
output.push(' '); output.push(' ');
} }
@ -125,9 +125,9 @@ pub fn uu_app() -> Command {
.action(ArgAction::SetTrue), .action(ArgAction::SetTrue),
) )
.arg( .arg(
Arg::new(options::KERNELNAME) Arg::new(options::KERNEL_NAME)
.short('s') .short('s')
.long(options::KERNELNAME) .long(options::KERNEL_NAME)
.alias("sysname") // Obsolescent option in GNU uname .alias("sysname") // Obsolescent option in GNU uname
.help("print the kernel name.") .help("print the kernel name.")
.action(ArgAction::SetTrue), .action(ArgAction::SetTrue),
@ -143,17 +143,17 @@ pub fn uu_app() -> Command {
.action(ArgAction::SetTrue), .action(ArgAction::SetTrue),
) )
.arg( .arg(
Arg::new(options::KERNELRELEASE) Arg::new(options::KERNEL_RELEASE)
.short('r') .short('r')
.long(options::KERNELRELEASE) .long(options::KERNEL_RELEASE)
.alias("release") // Obsolescent option in GNU uname .alias("release") // Obsolescent option in GNU uname
.help("print the operating system release.") .help("print the operating system release.")
.action(ArgAction::SetTrue), .action(ArgAction::SetTrue),
) )
.arg( .arg(
Arg::new(options::KERNELVERSION) Arg::new(options::KERNEL_VERSION)
.short('v') .short('v')
.long(options::KERNELVERSION) .long(options::KERNEL_VERSION)
.help("print the operating system version.") .help("print the operating system version.")
.action(ArgAction::SetTrue), .action(ArgAction::SetTrue),
) )
@ -180,9 +180,9 @@ pub fn uu_app() -> Command {
.hide(true), .hide(true),
) )
.arg( .arg(
Arg::new(options::HWPLATFORM) Arg::new(options::HARDWARE_PLATFORM)
.short('i') .short('i')
.long(options::HWPLATFORM) .long(options::HARDWARE_PLATFORM)
.help("print the hardware platform (non-portable)") .help("print the hardware platform (non-portable)")
.action(ArgAction::SetTrue) .action(ArgAction::SetTrue)
.hide(true), .hide(true),