ls: fix for gnu test case quote-align compatibility

src/uu/ls/src/ls.rs

@@ -2037,12 +2037,18 @@ impl PathData {
 }
 
 fn show_dir_name(path_data: &PathData, out: &mut BufWriter<Stdout>, config: &Config) {
+ let name = escape_name(
+ path_data.p_buf.as_os_str(),
+ &config.quoting_style,
+ // We tell `escape_name` to quote if it contains ':' because the user
+ // could distinguish it from the ":" we are about to print next.
+ &[':'],
+ );
  if config.hyperlink && !config.dired {
- let name = escape_name(path_data.p_buf.as_os_str(), &config.quoting_style);
  let hyperlink = create_hyperlink(&name, path_data);
  write!(out, "{}:", hyperlink).unwrap();
  } else {
- write!(out, "{}:", path_data.p_buf.display()).unwrap();
+ write!(out, "{}:", name).unwrap();
  }
 }
 
@@ -2499,7 +2505,7 @@ fn display_items(
  // option, print the security context to the left of the size column.
 
  let quoted = items.iter().any(|item| {
- let name = escape_name(&item.display_name, &config.quoting_style);
+ let name = escape_name(&item.display_name, &config.quoting_style, &[]);
  name.starts_with('\'')
  });
 
@@ -3213,7 +3219,7 @@ fn display_item_name(
  current_column: usize,
 ) -> String {
  // This is our return value. We start by `&path.display_name` and modify it along the way.
- let mut name = escape_name(&path.display_name, &config.quoting_style);
+ let mut name = escape_name(&path.display_name, &config.quoting_style, &[]);
 
  let is_wrap =
  |namelen: usize| config.width != 0 && current_column + namelen > config.width.into();
@@ -3295,7 +3301,7 @@ fn display_item_name(
  name.push_str(&path.p_buf.read_link().unwrap().to_string_lossy());
  } else {
  name.push_str(&color_name(
- &escape_name(target.as_os_str(), &config.quoting_style),
+ &escape_name(target.as_os_str(), &config.quoting_style, &[]),
  path,
  style_manager,
  out,
@@ -3306,7 +3312,7 @@ fn display_item_name(
  } else {
  // If no coloring is required, we just use target as is.
  // Apply the right quoting
- name.push_str(&escape_name(target.as_os_str(), &config.quoting_style));
+ name.push_str(&escape_name(target.as_os_str(), &config.quoting_style, &[]));
  }
  }
  Err(err) => {

src/uu/wc/src/wc.rs

@@ -259,7 +259,7 @@
  match self {
  Self::Path(path) => Some(match path.to_str() {
  Some(s) if !s.contains('\n') => Cow::Borrowed(s),
- _ => Cow::Owned(escape_name(path.as_os_str(), QS_ESCAPE)),
+ _ => Cow::Owned(escape_name(path.as_os_str(), QS_ESCAPE, &[])),
  }),
  Self::Stdin(StdinKind::Explicit) => Some(Cow::Borrowed(STDIN_REPR)),
  Self::Stdin(StdinKind::Implicit) => None,
@@ -269,7 +269,7 @@
  /// Converts input into the form that appears in errors.
  fn path_display(&self) -> String {
  match self {
- Self::Path(path) => escape_name(path.as_os_str(), QS_ESCAPE),
+ Self::Path(path) => escape_name(path.as_os_str(), QS_ESCAPE, &[]),
  Self::Stdin(_) => String::from("standard input"),
  }
  }
@@ -361,7 +361,7 @@
  Some((input, idx)) => {
  let path = match input {
  Input::Stdin(_) => STDIN_REPR.into(),
- Input::Path(path) => escape_name(path.as_os_str(), QS_ESCAPE).into(),
+ Input::Path(path) => escape_name(path.as_os_str(), QS_ESCAPE, &[]).into(),
  };
  Self::ZeroLengthFileNameCtx { path, idx }
  }
@@ -761,7 +761,7 @@
  Err(e) => Err(e.map_err_context(|| {
  format!(
  "cannot open {} for reading",
- escape_name(path.as_os_str(), QS_QUOTE_ESCAPE)
+ escape_name(path.as_os_str(), QS_QUOTE_ESCAPE, &[])
  )
  })),
  }
@@ -794,7 +794,7 @@
  }
  }
  Err(e) => Err(e.map_err_context(|| {
- format!("{}: read error", escape_name(&err_path, QS_ESCAPE))
+ format!("{}: read error", escape_name(&err_path, QS_ESCAPE, &[]))
  }) as Box<dyn UError>),
  }),
  );

src/uucore/src/lib/features/format/argument.rs

@@ -101,6 +101,7 @@ fn extract_value<T: Default>(p: Result<T, ParseError<'_, T>>, input: &str) -> T
  &QuotingStyle::C {
  quotes: Quotes::None,
  },
+ &[],
  );
  match e {
  ParseError::Overflow => {

src/uucore/src/lib/features/format/spec.rs

@@ -363,6 +363,7 @@ impl Spec {
  always_quote: false,
  show_control: false,
  },
+ &[],
  )
  .as_bytes(),
  )