From: Benno Schulenberg <bensberg@telfort.nl>
Date: Fri, 25 Apr 2025 10:34:21 +0000 (+0200)
Subject: pipesz: report default size in --help, instead of referring the user
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fa6d89e6e313bfd234bbf286023da7ae73769ce9;p=thirdparty%2Futil-linux.git

pipesz: report default size in --help, instead of referring the user

The man page says where this default size can be found.  In the --help
text it is more useful to directly say what this default size is.

CC: Nathan Sharp <nwsharp@live.com>
Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>
---

diff --git a/misc-utils/pipesz.c b/misc-utils/pipesz.c
index 48f07aed7..6eb5cc001 100644
--- a/misc-utils/pipesz.c
+++ b/misc-utils/pipesz.c
@@ -61,6 +61,9 @@ static char opt_verbose = 0;	/* --verbose */
 
 static void __attribute__((__noreturn__)) usage(void)
 {
+	if (ul_path_read_s32(NULL, &opt_size, PIPESZ_DEFAULT_SIZE_FILE))
+		warn(_("cannot parse %s"), PIPESZ_DEFAULT_SIZE_FILE);
+
 	fputs(USAGE_HEADER, stdout);
 	fprintf(stdout, _(" %s [options] [--set <size>] [--] [command]\n"), program_invocation_short_name);
 	fprintf(stdout, _(" %s [options] --get\n"), program_invocation_short_name);
@@ -71,11 +74,8 @@ static void __attribute__((__noreturn__)) usage(void)
 
 	fputs(USAGE_OPTIONS, stdout);
 	fputsln(_(" -g, --get          examine pipe buffers"), stdout);
-	/* TRANSLATORS: '%s' refers to a system file */
 	fprintf(stdout,
-	     _(" -s, --set <size>   set pipe buffer sizes\n"
-	       "                      size defaults to %s\n"),
-		PIPESZ_DEFAULT_SIZE_FILE);
+		_(" -s, --set <size>   the buffer size to be used (default: %u)\n"), opt_size);
 
 	fputs(USAGE_SEPARATOR, stdout);
 	fputsln(_(" -f, --file <path>  act on a file"), stdout);