uptime: Add -p, --pretty argument

Author: irbeam

Cargo.lock

@@ -349,7 +349,7 @@ walkdir = "2.5"
 winapi-util = "0.1.8"
 windows-sys = { version = "0.59.0", default-features = false }
 xattr = "1.3.1"
-zip = { version = "2.2.2", default-features = false, features = ["deflate"] }
+zip = { version = "3.0.0", default-features = false, features = ["deflate"] }
 
 hex = "0.4.3"
 md-5 = "0.10.6"

Cargo.toml

@@ -92,7 +92,9 @@ also provides a `-v`/`--verbose` flag.
 
 ## `uptime`
 
-Similar to the proc-ps implementation and unlike GNU/Coreutils, `uptime` provides `-s`/`--since` to show since when the system is up.
+Similar to the proc-ps implementation and unlike GNU/Coreutils, `uptime` provides:
+* `-s`/`--since` to show since when the system is up
+* `-p`/`--pretty` to display uptime in a pretty-printed format
 
 ## `base32/base64/basenc`
 

docs/src/extensions.md

@@ -138,7 +138,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
         selinux_supported: {
             #[cfg(feature = "selinux")]
             {
-                selinux::kernel_support() != selinux::KernelSupport::Unsupported
+                uucore::selinux::is_selinux_enabled()
             }
             #[cfg(not(feature = "selinux"))]
             {
@@ -174,13 +174,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
         ));
     }
 
-    let delimiter = {
-        if state.zflag {
-            "\0".to_string()
-        } else {
-            " ".to_string()
-        }
-    };
+    let delimiter = if state.zflag { "\0" } else { " " };
     let line_ending = LineEnding::from_zero_flag(state.zflag);
 
     if state.cflag {
@@ -307,7 +301,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
                         }
                     })
                     .collect::<Vec<_>>()
-                    .join(&delimiter),
+                    .join(delimiter),
                 // NOTE: this is necessary to pass GNU's "tests/id/zero.sh":
                 if state.zflag && state.user_specified && users.len() > 1 {
                     "\0"

fuzz/Cargo.lock

@@ -1157,7 +1157,7 @@ impl Config {
             selinux_supported: {
                 #[cfg(feature = "selinux")]
                 {
-                    selinux::kernel_support() != selinux::KernelSupport::Unsupported
+                    uucore::selinux::is_selinux_enabled()
                 }
                 #[cfg(not(feature = "selinux"))]
                 {
@@ -2576,26 +2576,21 @@ fn display_items(
 
         for item in items {
             #[cfg(unix)]
-            if config.inode || config.alloc_size {
-                let more_info = display_additional_leading_info(
-                    item,
-                    &padding_collection,
-                    config,
-                    &mut state.out,
-                )?;
-
-                write!(state.out, "{more_info}")?;
-            }
+            let should_display_leading_info = config.inode || config.alloc_size;
             #[cfg(not(unix))]
-            if config.alloc_size {
+            let should_display_leading_info = config.alloc_size;
+
+            if should_display_leading_info {
                 let more_info = display_additional_leading_info(
                     item,
                     &padding_collection,
                     config,
                     &mut state.out,
                 )?;
+
                 write!(state.out, "{more_info}")?;
             }
+
             display_item_long(item, &padding_collection, config, state, dired, quoted)?;
         }
     } else {

src/uu/id/src/id.rs

@@ -468,8 +468,8 @@ fn make_temp_dir(dir: &Path, prefix: &str, rand: usize, suffix: &str) -> UResult
 
     match builder.tempdir_in(dir) {
         Ok(d) => {
-            // `into_path` consumes the TempDir without removing it
-            let path = d.into_path();
+            // `keep` consumes the TempDir without removing it
+            let path = d.keep();
             Ok(path)
         }
         Err(e) if e.kind() == ErrorKind::NotFound => {

src/uu/ls/src/ls.rs

@@ -20,10 +20,10 @@ path = "src/pr.rs"
 [dependencies]
 clap = { workspace = true }
 uucore = { workspace = true, features = ["entries"] }
-quick-error = { workspace = true }
 itertools = { workspace = true }
 regex = { workspace = true }
 chrono = { workspace = true }
+thiserror = { workspace = true }
 
 [[bin]]
 name = "pr"

src/uu/mktemp/src/mktemp.rs

@@ -9,14 +9,13 @@
 use chrono::{DateTime, Local};
 use clap::{Arg, ArgAction, ArgMatches, Command};
 use itertools::Itertools;
-use quick_error::ResultExt;
 use regex::Regex;
 use std::fs::{File, metadata};
 use std::io::{BufRead, BufReader, Lines, Read, Write, stdin, stdout};
 #[cfg(unix)]
 use std::os::unix::fs::FileTypeExt;
+use thiserror::Error;
 
-use quick_error::quick_error;
 use uucore::display::Quotable;
 use uucore::error::UResult;
 use uucore::{format_usage, help_about, help_section, help_usage};
@@ -134,35 +133,21 @@ impl From<std::io::Error> for PrError {
     }
 }
 
-quick_error! {
-    #[derive(Debug)]
-    enum PrError {
-        Input(err: std::io::Error, path: String) {
-            context(path: &'a str, err: std::io::Error) -> (err, path.to_owned())
-            display("pr: Reading from input {path} gave error")
-            source(err)
-        }
-
-        UnknownFiletype(path: String) {
-            display("pr: {path}: unknown filetype")
-        }
-
-        EncounteredErrors(msg: String) {
-            display("pr: {msg}")
-        }
-
-        IsDirectory(path: String) {
-            display("pr: {path}: Is a directory")
-        }
-
-        IsSocket(path: String) {
-            display("pr: cannot open {path}, Operation not supported on socket")
-        }
-
-        NotExists(path: String) {
-            display("pr: cannot open {path}, No such file or directory")
-        }
-    }
+#[derive(Debug, Error)]
+enum PrError {
+    #[error("pr: Reading from input {1} gave error")]
+    Input(std::io::Error, String),
+    #[error("pr: {0}: unknown filetype")]
+    UnknownFiletype(String),
+    #[error("pr: {0}")]
+    EncounteredErrors(String),
+    #[error("pr: {0}: Is a directory")]
+    IsDirectory(String),
+    #[cfg(not(windows))]
+    #[error("pr: cannot open {0}, Operation not supported on socket")]
+    IsSocket(String),
+    #[error("pr: cannot open {0}, No such file or directory")]
+    NotExists(String),
 }
 
 pub fn uu_app() -> Command {
@@ -795,9 +780,9 @@ fn open(path: &str) -> Result<Box<dyn Read>, PrError> {
                 #[cfg(unix)]
                 ft if ft.is_socket() => Err(PrError::IsSocket(path_string)),
                 ft if ft.is_dir() => Err(PrError::IsDirectory(path_string)),
-                ft if ft.is_file() || ft.is_symlink() => {
-                    Ok(Box::new(File::open(path).context(path)?) as Box<dyn Read>)
-                }
+                ft if ft.is_file() || ft.is_symlink() => Ok(Box::new(
+                    File::open(path).map_err(|e| PrError::Input(e, path.to_string()))?,
+                ) as Box<dyn Read>),
                 _ => Err(PrError::UnknownFiletype(path_string)),
             }
         })

src/uu/pr/Cargo.toml

@@ -19,7 +19,7 @@ path = "src/runcon.rs"
 
 [dependencies]
 clap = { workspace = true }
-uucore = { workspace = true, features = ["entries", "fs", "perms"] }
+uucore = { workspace = true, features = ["entries", "fs", "perms", "selinux"] }
 selinux = { workspace = true }
 thiserror = { workspace = true }
 libc = { workspace = true }