From: Karel Zak <kzak@redhat.com>
Date: Tue, 16 Aug 2011 11:07:30 +0000 (+0200)
Subject: flock: cleanup usage()
X-Git-Tag: v2.20-rc2~28
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2e49d90f345be4cd6a54b3218aa0339b17a8a558;p=thirdparty%2Futil-linux.git

flock: cleanup usage()

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/sys-utils/flock.c b/sys-utils/flock.c
index c7fb70e2ba..7d321de0d9 100644
--- a/sys-utils/flock.c
+++ b/sys-utils/flock.c
@@ -62,21 +62,22 @@ const char *program;
 
 static void usage(int ex)
 {
-  fputs("flock (" PACKAGE_STRING ")\n", stderr);
+  fputs(_("\nUsage:\n"), stderr);
   fprintf(stderr,
-	_("Usage: %1$s [-sxun][-w #] fd#\n"
-	  "       %1$s [-sxon][-w #] file [-c] command...\n"
-	  "       %1$s [-sxon][-w #] directory [-c] command...\n"
-	  "  -s  --shared     Get a shared lock\n"
-	  "  -x  --exclusive  Get an exclusive lock\n"
-	  "  -u  --unlock     Remove a lock\n"
-	  "  -n  --nonblock   Fail rather than wait\n"
-	  "  -w  --timeout    Wait for a limited amount of time\n"
-	  "  -o  --close      Close file descriptor before running command\n"
-	  "  -c  --command    Run a single command string through the shell\n"
-	  "  -h  --help       Display this text\n"
-	  "  -V  --version    Display version\n"),
-	  program);
+	_(" %1$s [-sxun][-w #] fd#\n"
+	  " %1$s [-sxon][-w #] file [-c] command...\n"
+	  " %1$s [-sxon][-w #] directory [-c] command...\n"), program);
+
+  fputs(_("\nOptions:\n"), stderr);
+  fputs(_(" -s  --shared     Get a shared lock\n"
+	  " -x  --exclusive  Get an exclusive lock\n"
+	  " -u  --unlock     Remove a lock\n"
+	  " -n  --nonblock   Fail rather than wait\n"
+	  " -w  --timeout    Wait for a limited amount of time\n"
+	  " -o  --close      Close file descriptor before running command\n"
+	  " -c  --command    Run a single command string through the shell\n"
+	  " -h  --help       Display this text\n"
+	  " -V  --version    Display version\n\n"), stderr);
   exit(ex);
 }