And separate short and long options with the standard comma.
Signed-off-by: Benno Schulenberg <bensberg@xxxxxxxxxxxxx>
---
sys-utils/flock.c | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/sys-utils/flock.c b/sys-utils/flock.c
index f160eac..dabacb8 100644
--- a/sys-utils/flock.c
+++ b/sys-utils/flock.c
@@ -49,19 +49,19 @@ static void __attribute__((__noreturn__)) usage(int ex)
{
fprintf(stderr, USAGE_HEADER);
fprintf(stderr,
- _(" %1$s [options] <file|directory> <command> [<arguments>...]\n"
- " %1$s [options] <file|directory> -c <command>\n"
+ _(" %1$s [options] <file>|<directory> <command> [<argument>...]\n"
+ " %1$s [options] <file>|<directory> -c <command>\n"
" %1$s [options] <file descriptor number>\n"),
program_invocation_short_name);
fputs(USAGE_OPTIONS, stderr);
- fputs(_( " -s --shared get a shared lock\n"), stderr);
- fputs(_( " -x --exclusive get an exclusive lock (default)\n"), stderr);
- fputs(_( " -u --unlock remove a lock\n"), stderr);
- fputs(_( " -n --nonblock fail rather than wait\n"), stderr);
- fputs(_( " -w --timeout <secs> wait for a limited amount of time\n"), stderr);
- fputs(_( " -E --conflict-exit-code <number> exit code after conflict or timeout\n"), stderr);
- fputs(_( " -o --close close file descriptor before running command\n"), stderr);
- fputs(_( " -c --command <command> run a single command string through the shell\n"), stderr);
+ fputs(_( " -s, --shared get a shared lock\n"), stderr);
+ fputs(_( " -x, --exclusive get an exclusive lock (default)\n"), stderr);
+ fputs(_( " -u, --unlock remove a lock\n"), stderr);
+ fputs(_( " -n, --nonblock fail rather than wait\n"), stderr);
+ fputs(_( " -w, --timeout <secs> wait for a limited amount of time\n"), stderr);
+ fputs(_( " -E, --conflict-exit-code <number> exit code after conflict or timeout\n"), stderr);
+ fputs(_( " -o, --close close file descriptor before running command\n"), stderr);
+ fputs(_( " -c, --command <command> run a single command string through the shell\n"), stderr);
fprintf(stderr, USAGE_SEPARATOR);
fprintf(stderr, USAGE_HELP);
fprintf(stderr, USAGE_VERSION);
--
1.7.0.4
--
To unsubscribe from this list: send the line "unsubscribe util-linux" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
