Mirrors/coreutils
2
0
Fork 0
mirror of https://github.com/uutils/coreutils synced 2024-12-18 00:53:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1113 from tsliang/master

Browse source 
uname: change sysname flag to kernel-name
This commit is contained in:
Alex Lyon 2017-12-27 03:23:40 -08:00 committed by GitHub
commit 6d61b6805d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 68 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/uname/Cargo.toml
View file

@ -8,6 +8,9 @@ build = "../../mkmain.rs"
name = "uu_uname" name = "uu_uname"
path = "uname.rs" path = "uname.rs"
[dependencies]
clap = "2.20.0"
[dependencies.uucore] [dependencies.uucore]
path = "../uucore" path = "../uucore"
default-features = false default-features = false

87
src/uname/uname.rs
View file

@ -13,10 +13,25 @@
#[macro_use] #[macro_use]
extern crate uucore; extern crate uucore;
extern crate clap;
use clap::{Arg, App};
use uucore::utsname::Uname; use uucore::utsname::Uname;
static SYNTAX: &'static str = "[OPTION]..."; static VERSION: &'static str = env!("CARGO_PKG_VERSION");
static SUMMARY: &'static str = "Print certain system information. With no OPTION, same as -s."; static ABOUT: &'static str = "Print certain system information. With no OPTION, same as -s.";
static OPT_ALL: &'static str = "all";
static OPT_KERNELNAME: &'static str = "kernel-name";
static OPT_NODENAME: &'static str = "nodename";
static OPT_KERNELVERSION: &'static str = "kernel-version";
static OPT_KERNELRELEASE: &'static str = "kernel-release";
static OPT_MACHINE: &'static str = "machine";
//FIXME: unimplemented options
//static OPT_PROCESSOR: &'static str = "processor";
//static OPT_HWPLATFORM: &'static str = "hardware-platform";
static OPT_OS: &'static str = "operating-system";
#[cfg(target_os = "linux")] #[cfg(target_os = "linux")]
static HOST_OS: &'static str = "GNU/Linux"; static HOST_OS: &'static str = "GNU/Linux";
@ -32,48 +47,76 @@ static HOST_OS: &'static str = "Darwin";
static HOST_OS: &'static str = "Fuchsia"; static HOST_OS: &'static str = "Fuchsia";
pub fn uumain(args: Vec<String>) -> i32 { pub fn uumain(args: Vec<String>) -> i32 {
let mut opts = new_coreopts!(SYNTAX, SUMMARY, "");
opts.optflag("a", let usage = format!("{} [OPTION]...", executable!());
"all", let matches = App::new(executable!())
"Behave as though all of the options -mnrsv were specified."); .version(VERSION)
opts.optflag("s", "sysname", "print the operating system name."); .about(ABOUT)
opts.optflag("n", "nodename", "print the nodename (the nodename may be a name that the system is known by to a communications network)."); .usage(&usage[..])
opts.optflag("r", "kernel-release", "print the operating system release."); .arg(Arg::with_name(OPT_ALL)
opts.optflag("v", "kernel-version", "print the operating system version."); .short("a")
opts.optflag("m", "machine", "print the machine hardware name."); .long(OPT_ALL)
.help("Behave as though all of the options -mnrsv were specified."))
.arg(Arg::with_name(OPT_KERNELNAME)
.short("s")
.long(OPT_KERNELNAME)
.alias("sysname") // Obsolescent option in GNU uname
.help("print the operating system name."))
.arg(Arg::with_name(OPT_NODENAME)
.short("n")
.long(OPT_NODENAME)
.help("print the nodename (the nodename may be a name that the system is known by to a communications network)."))
.arg(Arg::with_name(OPT_KERNELRELEASE)
.short("r")
.long(OPT_KERNELRELEASE)
.alias("release") // Obsolescent option in GNU uname
.help("print the operating system release."))
.arg(Arg::with_name(OPT_KERNELVERSION)
.short("v")
.long(OPT_KERNELVERSION)
.help("print the operating system version."))
// FIXME: Unimplemented //FIXME: unimplemented options
// opts.optflag("p", "processor", "print the machine processor architecture name."); // .arg(Arg::with_name(OPT_PROCESSOR)
// opts.optflag("i", "hardware-platform", "print the hardware platform."); // .short("p")
// .long(OPT_PROCESSOR)
// .help("print the processor type (non-portable)"))
// .arg(Arg::with_name(OPT_HWPLATFORM)
// .short("i")
// .long(OPT_HWPLATFORM)
// .help("print the hardware platform (non-portable)"))
.arg(Arg::with_name(OPT_MACHINE)
.short("m")
.long(OPT_MACHINE)
.help("print the machine hardware name."))
.get_matches_from(&args);
opts.optflag("o", "operating-system", "print the operating system");
let argc = args.len(); let argc = args.len();
let matches = opts.parse(args);
let uname = Uname::new(); let uname = Uname::new();
let mut output = String::new(); let mut output = String::new();
if matches.opt_present("sysname") || matches.opt_present("all") || argc == 1 {
if matches.is_present(OPT_KERNELNAME) || matches.is_present(OPT_ALL) || argc == 1 {
output.push_str(uname.sysname().as_ref()); output.push_str(uname.sysname().as_ref());
output.push_str(" "); output.push_str(" ");
} }
if matches.opt_present("nodename") || matches.opt_present("all") { if matches.is_present(OPT_NODENAME) || matches.is_present(OPT_ALL) {
output.push_str(uname.nodename().as_ref()); output.push_str(uname.nodename().as_ref());
output.push_str(" "); output.push_str(" ");
} }
if matches.opt_present("kernel-release") || matches.opt_present("all") { if matches.is_present(OPT_KERNELRELEASE) || matches.is_present(OPT_ALL) {
output.push_str(uname.release().as_ref()); output.push_str(uname.release().as_ref());
output.push_str(" "); output.push_str(" ");
} }
if matches.opt_present("kernel-version") || matches.opt_present("all") { if matches.is_present(OPT_KERNELVERSION) || matches.is_present(OPT_ALL) {
output.push_str(uname.version().as_ref()); output.push_str(uname.version().as_ref());
output.push_str(" "); output.push_str(" ");
} }
if matches.opt_present("machine") || matches.opt_present("all") { if matches.is_present(OPT_MACHINE) || matches.is_present(OPT_ALL) {
output.push_str(uname.machine().as_ref()); output.push_str(uname.machine().as_ref());
output.push_str(" "); output.push_str(" ");
} }
if matches.opt_present("operating-system") || matches.opt_present("all") { if matches.is_present(OPT_OS) || matches.is_present(OPT_ALL) {
output.push_str(HOST_OS); output.push_str(HOST_OS);
output.push_str(" "); output.push_str(" ");
} }