Merge branch 'main' into install_copy_permission

src/uu/cksum/src/cksum.rs

@@ -4,8 +4,9 @@
 // file that was distributed with this source code.
 
 // spell-checker:ignore (ToDO) fname, algo
+use clap::builder::ValueParser;
 use clap::{crate_version, value_parser, Arg, ArgAction, Command};
-use std::ffi::OsStr;
+use std::ffi::{OsStr, OsString};
 use std::fs::File;
 use std::io::{self, stdin, stdout, BufReader, Read, Write};
 use std::iter;
@@ -18,7 +19,7 @@ use uucore::checksum::{
 use uucore::{
  encoding,
  error::{FromIo, UResult, USimpleError},
- format_usage, help_about, help_section, help_usage, show,
+ format_usage, help_about, help_section, help_usage, os_str_as_bytes, show,
  sum::{div_ceil, Digest},
 };
 
@@ -116,52 +117,64 @@ where
  };
  // The BSD checksum output is 5 digit integer
  let bsd_width = 5;
- match (options.algo_name, not_file) {
- (ALGORITHM_OPTIONS_SYSV, true) => println!(
- "{} {}",
- sum.parse::<u16>().unwrap(),
- div_ceil(sz, options.output_bits)
+ let (before_filename, should_print_filename, after_filename) = match options.algo_name {
+ ALGORITHM_OPTIONS_SYSV => (
+ format!(
+ "{} {}{}",
+ sum.parse::<u16>().unwrap(),
+ div_ceil(sz, options.output_bits),
+ if not_file { "" } else { " " }
+ ),
+ !not_file,
+ String::new(),
  ),
- (ALGORITHM_OPTIONS_SYSV, false) => println!(
- "{} {} {}",
- sum.parse::<u16>().unwrap(),
- div_ceil(sz, options.output_bits),
- filename.display()
+ ALGORITHM_OPTIONS_BSD => (
+ format!(
+ "{:0bsd_width$} {:bsd_width$}{}",
+ sum.parse::<u16>().unwrap(),
+ div_ceil(sz, options.output_bits),
+ if not_file { "" } else { " " }
+ ),
+ !not_file,
+ String::new(),
  ),
- (ALGORITHM_OPTIONS_BSD, true) => println!(
- "{:0bsd_width$} {:bsd_width$}",
- sum.parse::<u16>().unwrap(),
- div_ceil(sz, options.output_bits)
+ ALGORITHM_OPTIONS_CRC => (
+ format!("{sum} {sz}{}", if not_file { "" } else { " " }),
+ !not_file,
+ String::new(),
  ),
- (ALGORITHM_OPTIONS_BSD, false) => println!(
- "{:0bsd_width$} {:bsd_width$} {}",
- sum.parse::<u16>().unwrap(),
- div_ceil(sz, options.output_bits),
- filename.display()
- ),
- (ALGORITHM_OPTIONS_CRC, true) => println!("{sum} {sz}"),
- (ALGORITHM_OPTIONS_CRC, false) => println!("{sum} {sz} {}", filename.display()),
- (ALGORITHM_OPTIONS_BLAKE2B, _) if options.tag => {
- if let Some(length) = options.length {
- // Multiply by 8 here, as we want to print the length in bits.
- println!("BLAKE2b-{} ({}) = {sum}", length * 8, filename.display());
- } else {
- println!("BLAKE2b ({}) = {sum}", filename.display());
- }
+ ALGORITHM_OPTIONS_BLAKE2B if options.tag => {
+ (
+ if let Some(length) = options.length {
+ // Multiply by 8 here, as we want to print the length in bits.
+ format!("BLAKE2b-{} (", length * 8)
+ } else {
+ "BLAKE2b (".to_owned()
+ },
+ true,
+ format!(") = {sum}"),
+ )
  }
  _ => {
  if options.tag {
- println!(
- "{} ({}) = {sum}",
- options.algo_name.to_ascii_uppercase(),
- filename.display()
- );
+ (
+ format!("{} (", options.algo_name.to_ascii_uppercase()),
+ true,
+ format!(") = {sum}"),
+ )
  } else {
  let prefix = if options.asterisk { "*" } else { " " };
- println!("{sum} {prefix}{}", filename.display());
+ (format!("{sum} {prefix}"), true, String::new())
  }
  }
+ };
+ print!("{}", before_filename);
+ if should_print_filename {
+ // The filename might not be valid UTF-8, and filename.display() would mangle the names.
+ // Therefore, emit the bytes directly to stdout, without any attempt at encoding them.
+ let _dropped_result = stdout().write_all(os_str_as_bytes(filename.as_os_str())?);
  }
+ println!("{}", after_filename);
  }
 
  Ok(())
@@ -209,7 +222,7 @@ fn prompt_asterisk(tag: bool, binary: bool, had_reset: bool) -> bool {
  * Don't do it with clap because if it struggling with the --overrides_with
  * marking the value as set even if not present
  */
-fn had_reset(args: &[String]) -> bool {
+fn had_reset(args: &[OsString]) -> bool {
  // Indices where "--binary" or "-b", "--tag", and "--untagged" are found
  let binary_index = args.iter().position(|x| x == "--binary" || x == "-b");
  let tag_index = args.iter().position(|x| x == "--tag");
@@ -234,7 +247,7 @@ fn handle_tag_text_binary_flags(matches: &clap::ArgMatches) -> UResult<(bool, bo
 
  let binary_flag: bool = matches.get_flag(options::BINARY);
 
- let args: Vec<String> = std::env::args().collect();
+ let args: Vec<OsString> = std::env::args_os().collect();
  let had_reset = had_reset(&args);
 
  let asterisk: bool = prompt_asterisk(tag, binary_flag, had_reset);
@@ -298,7 +311,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
 
  // Execute the checksum validation based on the presence of files or the use of stdin
 
- let files = matches.get_many::<String>(options::FILE).map_or_else(
+ let files = matches.get_many::<OsString>(options::FILE).map_or_else(
  || iter::once(OsStr::new("-")).collect::<Vec<_>>(),
  |files| files.map(OsStr::new).collect::<Vec<_>>(),
  );
@@ -337,7 +350,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
  asterisk,
  };
 
- match matches.get_many::<String>(options::FILE) {
+ match matches.get_many::<OsString>(options::FILE) {
  Some(files) => cksum(opts, files.map(OsStr::new))?,
  None => cksum(opts, iter::once(OsStr::new("-")))?,
  };
@@ -356,6 +369,7 @@ pub fn uu_app() -> Command {
  Arg::new(options::FILE)
  .hide(true)
  .action(clap::ArgAction::Append)
+ .value_parser(ValueParser::os_string())
  .value_hint(clap::ValueHint::FilePath),
  )
  .arg(
@@ -469,61 +483,62 @@ mod tests {
  use super::had_reset;
  use crate::calculate_blake2b_length;
  use crate::prompt_asterisk;
+ use std::ffi::OsString;
 
  #[test]
  fn test_had_reset() {
  let args = ["--binary", "--tag", "--untagged"]
  .iter()
- .map(|&s| s.to_string())
- .collect::<Vec<String>>();
+ .map(|&s| s.into())
+ .collect::<Vec<OsString>>();
  assert!(had_reset(&args));
 
  let args = ["-b", "--tag", "--untagged"]
  .iter()
- .map(|&s| s.to_string())
- .collect::<Vec<String>>();
+ .map(|&s| s.into())
+ .collect::<Vec<OsString>>();
  assert!(had_reset(&args));
 
  let args = ["-b", "--binary", "--tag", "--untagged"]
  .iter()
- .map(|&s| s.to_string())
- .collect::<Vec<String>>();
+ .map(|&s| s.into())
+ .collect::<Vec<OsString>>();
  assert!(had_reset(&args));
 
  let args = ["--untagged", "--tag", "--binary"]
  .iter()
- .map(|&s| s.to_string())
- .collect::<Vec<String>>();
+ .map(|&s| s.into())
+ .collect::<Vec<OsString>>();
  assert!(!had_reset(&args));
 
  let args = ["--untagged", "--tag", "-b"]
  .iter()
- .map(|&s| s.to_string())
- .collect::<Vec<String>>();
+ .map(|&s| s.into())
+ .collect::<Vec<OsString>>();
  assert!(!had_reset(&args));
 
  let args = ["--binary", "--tag"]
  .iter()
- .map(|&s| s.to_string())
- .collect::<Vec<String>>();
+ .map(|&s| s.into())
+ .collect::<Vec<OsString>>();
  assert!(!had_reset(&args));
 
  let args = ["--tag", "--untagged"]
  .iter()
- .map(|&s| s.to_string())
- .collect::<Vec<String>>();
+ .map(|&s| s.into())
+ .collect::<Vec<OsString>>();
  assert!(!had_reset(&args));
 
  let args = ["--text", "--untagged"]
  .iter()
- .map(|&s| s.to_string())
- .collect::<Vec<String>>();
+ .map(|&s| s.into())
+ .collect::<Vec<OsString>>();
  assert!(!had_reset(&args));
 
  let args = ["--binary", "--untagged"]
  .iter()
- .map(|&s| s.to_string())
- .collect::<Vec<String>>();
+ .map(|&s| s.into())
+ .collect::<Vec<OsString>>();
  assert!(!had_reset(&args));
  }
 

src/uucore/Cargo.toml

@@ -88,7 +88,7 @@ mode = ["libc"]
 perms = ["libc", "walkdir"]
 pipes = []
 process = ["libc"]
-proc-info = ["walkdir"]
+proc-info = ["tty", "walkdir"]
 quoting-style = []
 ranges = []
 ringbuffer = []

src/uucore/src/lib/features/proc_info.rs

@@ -22,7 +22,7 @@
 use crate::features::tty::Teletype;
 use std::hash::Hash;
 use std::{
- collections::{HashMap, HashSet},
+ collections::HashMap,
  fmt::{self, Display, Formatter},
  fs, io,
  path::PathBuf,
@@ -120,7 +120,6 @@ pub struct ProcessInformation {
  cached_stat: Option<Rc<Vec<String>>>,
 
  cached_start_time: Option<u64>,
- cached_tty: Option<Rc<HashSet<Teletype>>>,
 }
 
 impl ProcessInformation {
@@ -242,42 +241,26 @@ impl ProcessInformation {
 
  /// This function will scan the `/proc/<pid>/fd` directory
  ///
- /// If the process does not belong to any terminal,
+ /// If the process does not belong to any terminal and mismatched permission,
  /// the result will contain [TerminalType::Unknown].
  ///
  /// Otherwise [TerminalType::Unknown] does not appear in the result.
- ///
- /// # Error
- ///
- /// If scanned pid had mismatched permission,
- /// it will caused [std::io::ErrorKind::PermissionDenied] error.
- pub fn ttys(&mut self) -> Result<Rc<HashSet<Teletype>>, io::Error> {
- if let Some(tty) = &self.cached_tty {
- return Ok(Rc::clone(tty));
- }
-
+ pub fn tty(&self) -> Teletype {
  let path = PathBuf::from(format!("/proc/{}/fd", self.pid));
 
  let Ok(result) = fs::read_dir(path) else {
- return Ok(Rc::new(HashSet::from_iter([Teletype::Unknown])));
+ return Teletype::Unknown;
  };
 
- let mut result = result
- .flatten()
- .filter(|it| it.path().is_symlink())
- .flat_map(|it| fs::read_link(it.path()))
- .flat_map(Teletype::try_from)
- .collect::<HashSet<_>>();
-
- if result.is_empty() {
- result.insert(Teletype::Unknown);
+ for dir in result.flatten().filter(|it| it.path().is_symlink()) {
+ if let Ok(path) = fs::read_link(dir.path()) {
+ if let Ok(tty) = Teletype::try_from(path) {
+ return tty;
+ }
+ }
  }
 
- let result = Rc::new(result);
-
- self.cached_tty = Some(Rc::clone(&result));
-
- Ok(result)
+ Teletype::Unknown
  }
 }
 
@@ -344,11 +327,9 @@ pub fn walk_process() -> impl Iterator<Item = ProcessInformation> {
 
 #[cfg(test)]
 mod tests {
-
- use crate::features::tty::Teletype;
-
  use super::*;
- use std::str::FromStr;
+ use crate::features::tty::Teletype;
+ use std::{collections::HashSet, str::FromStr};
 
  #[test]
  fn test_run_state_conversion() {
@@ -402,7 +383,11 @@ mod tests {
  .flat_map(Teletype::try_from)
  .collect::<HashSet<_>>();
 
- assert_eq!(pid_entry.ttys().unwrap(), result.into());
+ assert_eq!(result.len(), 1);
+ assert_eq!(
+ pid_entry.tty(),
+ Vec::from_iter(result.into_iter()).first().unwrap().clone()
+ );
  }
 
  #[test]