Skip to content

readlink: Set silent mode as default #10711

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

Open
denendaden wants to merge 2 commits into
base: main
Choose a base branch
from
+41 −4
Open

readlink: Set silent mode as default #10711

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6f5bade
readlink: Set silent mode as default
denendaden Feb 4, 2026
ef85753
readlink: Add tests for verbose and silent options
denendaden Feb 4, 2026
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
11 changes: 7 additions & 4 deletions src/uu/readlink/src/readlink.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
// spell-checker:ignore (ToDO) errno

use clap::{Arg, ArgAction, Command};
use std::env;
use std::ffi::OsString;
use std::fs;
use std::io::{Write, stdout};
Expand Down Expand Up @@ -35,8 +36,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {

let mut no_trailing_delimiter = matches.get_flag(OPT_NO_NEWLINE);
let use_zero = matches.get_flag(OPT_ZERO);
let silent = matches.get_flag(OPT_SILENT) || matches.get_flag(OPT_QUIET);
let verbose = matches.get_flag(OPT_VERBOSE);
let verbose = matches.get_flag(OPT_VERBOSE) || env::var("POSIXLY_CORRECT").is_ok();

// GNU readlink -f/-e/-m follows symlinks first and then applies `..` (physical resolution).
// ResolveMode::Logical collapses `..` before following links, which yields the opposite order,
Expand Down Expand Up @@ -70,7 +70,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
));
}

if no_trailing_delimiter && files.len() > 1 && !silent {
if no_trailing_delimiter && files.len() > 1 {
show_error!("{}", translate!("readlink-error-ignoring-no-newline"));
no_trailing_delimiter = false;
}
Expand All @@ -93,7 +93,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
show(&path, line_ending).map_err_context(String::new)?;
}
Err(err) => {
if silent && !verbose {
if !verbose {
return Err(1.into());
}

Expand Down Expand Up @@ -151,20 +151,23 @@ pub fn uu_app() -> Command {
.short('q')
.long(OPT_QUIET)
.help(translate!("readlink-help-quiet"))
.overrides_with_all([OPT_QUIET, OPT_SILENT, OPT_VERBOSE])
.action(ArgAction::SetTrue),
)
.arg(
Arg::new(OPT_SILENT)
.short('s')
.long(OPT_SILENT)
.help(translate!("readlink-help-silent"))
.overrides_with_all([OPT_QUIET, OPT_SILENT, OPT_VERBOSE])
.action(ArgAction::SetTrue),
)
.arg(
Arg::new(OPT_VERBOSE)
.short('v')
.long(OPT_VERBOSE)
.help(translate!("readlink-help-verbose"))
.overrides_with_all([OPT_QUIET, OPT_SILENT, OPT_VERBOSE])
.action(ArgAction::SetTrue),
)
.arg(
Expand Down
34 changes: 34 additions & 0 deletions tests/by-util/test_readlink.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,15 @@ fn test_posixly_correct_regular_file() {
.fails_with_code(1)
.stderr_contains("Invalid argument")
.no_stdout();

// GNU behavior is to ignore -s and -q when POSIXLY_CORRECT is set.
scene
.ucmd()
.env("POSIXLY_CORRECT", "1")
.args(&["-s", "regfile"])
.fails_with_code(1)
.stderr_contains("Invalid argument")
.no_stdout();
}

#[test]
Expand Down Expand Up @@ -433,3 +442,28 @@ fn test_readlink_non_utf8_paths() {
let output = result.stdout_str_lossy();
assert!(output.contains(file_name));
}

#[test]
fn test_verbose_or_silent() {
let scene = TestScenario::new(util_name!());
let at = &scene.fixtures;
at.touch("regfile");
scene
.ucmd()
.arg("regfile")
.fails_with_code(1)
.no_stderr()
.no_stdout();
scene
.ucmd()
.args(&["-v", "regfile"])
.fails_with_code(1)
.stderr_contains("Invalid argument")
.no_stdout();
scene
.ucmd()
.args(&["-vs", "regfile"])
.fails_with_code(1)
.no_stderr()
.no_stdout();
}
Loading