Re: [patches] some proper pluralization, and a bunch of textual fixes

[Benno Schulenberg <bensberg@justemail.net>]

[-- Attachment #1: Type: text/plain, Size: 541 bytes --]


On Fri, Jan 25, 2013, at 17:36, Karel Zak wrote:
> On Wed, Jan 23, 2013 at 05:02:30PM +0100, Benno Schulenberg wrote:
> > The eighth patch standardizes the version reporting to:
> > "program from util-linux-x.xx.x".
> 
>  It seems that Sami, you and I did the same changes. Please, can you 
>  pull from upstream repo and rebase this set of the patches?

Yes, done.

Just patch 7 and 8 changed, the content of the others stayed the same,
so I attached just those two.


Benno

-- 
http://www.fastmail.fm - A fast, anti-spam email service.


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0007-mkfs-indicate-that-specifying-fs-type-and-fs-options.patch --]
[-- Type: text/x-patch; name="0007-mkfs-indicate-that-specifying-fs-type-and-fs-options.patch", Size: 2909 bytes --]

From 16977c850251678707c39799d1cdb25b1c1af549 Mon Sep 17 00:00:00 2001
From: Benno Schulenberg <bensberg@justemail.net>
Date: Tue, 22 Jan 2013 11:56:58 +0100
Subject: [PATCH 07/10] mkfs: indicate that specifying fs-type and fs-options are independent

Also standardize and improve the help text, and slice it into strips
for ease of later translation maintenance.

Signed-off-by: Benno Schulenberg <bensberg@justemail.net>
---
 disk-utils/mkfs.8 |    2 +-
 disk-utils/mkfs.c |   28 ++++++++++++++--------------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/disk-utils/mkfs.8 b/disk-utils/mkfs.8
index af9304b..a4cdf71 100644
--- a/disk-utils/mkfs.8
+++ b/disk-utils/mkfs.8
@@ -7,7 +7,7 @@ mkfs \- build a Linux filesystem
 .B mkfs
 .RI [ options ]
 .RB [ \-t
-.IR "type fs-options" ] " device " [ size ]
+.IR type "] [" fs-options ] " device " [ size ]
 .SH DESCRIPTION
 .B mkfs
 is used to build a Linux filesystem on a device, usually
diff --git a/disk-utils/mkfs.c b/disk-utils/mkfs.c
index 55506c0..c34f9f6 100644
--- a/disk-utils/mkfs.c
+++ b/disk-utils/mkfs.c
@@ -35,20 +35,20 @@
 
 static void __attribute__ ((__noreturn__)) usage(FILE * out)
 {
-	fprintf(out,
-		_("Usage: %s [options] [-t type fs-options] device [size]\n"),
-		program_invocation_short_name);
-
-	fprintf(out, _("\nOptions:\n"
-		       " -t, --type=TYPE  file system type, when undefined ext2 is used\n"
-		       "     fs-options   parameters to real file system builder\n"
-		       "     device       path to a device\n"
-		       "     size         number of blocks on the device\n"
-		       " -V, --verbose    explain what is done\n"
-		       "                  defining -V more than once will cause a dry-run\n"
-		       " -V, --version    output version information and exit\n"
-		       "                  -V as version must be only option\n"
-		       " -h, --help       display this help and exit\n"));
+	fprintf(out, _("Usage:\n"));
+	fprintf(out, _(" %s [options] [-t <type>] [fs-options] <device> [<size>]\n"),
+		     program_invocation_short_name);
+
+	fprintf(out, _("\nOptions:\n"));
+	fprintf(out, _(" -t, --type=<type>  filesystem type; when unspecified, ext2 is used\n"));
+	fprintf(out, _("     fs-options     parameters for the real filesystem builder\n"));
+	fprintf(out, _("     <device>       path to the device to be used\n"));
+	fprintf(out, _("     <size>         number of blocks to be used on the device\n"));
+	fprintf(out, _(" -V, --verbose      explain what is being done;\n"
+		       "                      specifying -V more than once will cause a dry-run\n"));
+	fprintf(out, _(" -V, --version      display version information and exit;\n"
+		       "                      -V as --version must be the only option\n"));
+	fprintf(out, _(" -h, --help         display this help text and exit\n"));
 
 	fprintf(out, _("\nFor more information see mkfs(8).\n"));
 
-- 
1.7.0.4


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #3: 0008-textual-standardize-the-reporting-of-program-name-pl.patch --]
[-- Type: text/x-patch; name="0008-textual-standardize-the-reporting-of-program-name-pl.patch", Size: 1737 bytes --]

From 60f4d0e365fa503d11496e37f3793ec6c8055365 Mon Sep 17 00:00:00 2001
From: Benno Schulenberg <bensberg@justemail.net>
Date: Wed, 23 Jan 2013 13:48:50 +0100
Subject: [PATCH 08/10] textual: standardize the reporting of program name plus package version

Signed-off-by: Benno Schulenberg <bensberg@justemail.net>
---
 disk-utils/fsck.minix.c |    2 +-
 sys-utils/flock.c       |    3 +--
 text-utils/more.c       |    3 +--
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/disk-utils/fsck.minix.c b/disk-utils/fsck.minix.c
index 54e5918..fe92085 100644
--- a/disk-utils/fsck.minix.c
+++ b/disk-utils/fsck.minix.c
@@ -213,7 +213,7 @@ static void
 die(const char *fmt, ...) {
 	va_list ap;
 
-	fprintf(stderr, "%s: ", program_invocation_short_name);
+	fprintf(stderr, UTIL_LINUX_VERSION);
 	va_start(ap, fmt);
 	vfprintf(stderr, fmt, ap);
 	va_end(ap);
diff --git a/sys-utils/flock.c b/sys-utils/flock.c
index 11c44b6..6147e97 100644
--- a/sys-utils/flock.c
+++ b/sys-utils/flock.c
@@ -206,8 +206,7 @@ int main(int argc, char *argv[])
 				_("invalid exit code"));
 			break;
 		case 'V':
-			printf(_("%s from %s\n"),
-			       program_invocation_short_name, PACKAGE_STRING);
+			printf(UTIL_LINUX_VERSION);
 			exit(EX_OK);
 		default:
 			/* optopt will be set if this was an unrecognized
diff --git a/text-utils/more.c b/text-utils/more.c
index 2c97950..b94ae49 100644
--- a/text-utils/more.c
+++ b/text-utils/more.c
@@ -568,8 +568,7 @@ void argscan(char *s)
 		case '\t':
 			break;
 		case 'V':
-                        printf(_("%s from %s\n"),
-                               program_invocation_short_name, PACKAGE_STRING);
+			printf(UTIL_LINUX_VERSION);
 			exit(EXIT_SUCCESS);
 			break;
 		default:
-- 
1.7.0.4