Skip to content

uname: output OS last #8094

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
Jun 8, 2025
Merged

uname: output OS last #8094

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0835fc6
uname: print OS last
cakebaker Jun 7, 2025
05bcb65
uname: remove unnecessary mut & trim_end() call
cakebaker Jun 7, 2025
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
15 changes: 6 additions & 9 deletions src/uu/uname/src/uname.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,24 +38,21 @@ pub struct UNameOutput {

impl UNameOutput {
fn display(&self) -> String {
let mut output = String::new();
for name in [
[
self.kernel_name.as_ref(),
self.nodename.as_ref(),
self.kernel_release.as_ref(),
self.kernel_version.as_ref(),
self.machine.as_ref(),
self.os.as_ref(),
self.processor.as_ref(),
self.hardware_platform.as_ref(),
self.os.as_ref(),
]
.into_iter()
.flatten()
{
output.push_str(name);
output.push(' ');
}
output
.map(|name| name.as_str())
.collect::<Vec<_>>()
.join(" ")
}

pub fn new(opts: &Options) -> UResult<Self> {
Expand Down Expand Up @@ -138,7 +135,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
os: matches.get_flag(options::OS),
};
let output = UNameOutput::new(&options)?;
println!("{}", output.display().trim_end());
println!("{}", output.display());
Ok(())
}

Expand Down
Loading