script: fix ambiguity about the optional argument of the -t option

[kzak@redhat.com: - merge two patches from Antonio to the one,
                  - update the patch]

Signed-off-by: Karel Zak <kzak@redhat.com>
Signed-off-by: Antonio Ospite <ao2@ao2.it>

diff --git a/term-utils/script.1 b/term-utils/script.1
index ff3ef528dff35cc13b4fb844e97db352bd39a7fe..6c50bc621d1d61c2f85f68ac2ca3610b852e4812 100644 (file)
--- a/term-utils/script.1
+++ b/term-utils/script.1
@@ -85,7 +85,7 @@ or symbolic link.  The command will follow a symbolic link.
 \fB\-q\fR, \fB\-\-quiet\fR
 Be quiet (do not write start and done messages to standard output).
 .TP
-\fB\-t\fR, \fB\-\-timing\fR[=\fIfile\fR]
+\fB\-t\fR[\fIfile\fR], \fB\-\-timing\fR[=\fIfile\fR]
 Output timing data to standard error, or to
 .I file
 when given.  This data contains two fields, separated by a space.  The first

diff --git a/term-utils/script.c b/term-utils/script.c
index 814ee496197acb28351dad8f26868fe2b0cc198f..ffc7017b9ff187a9ebdaa998001c309029384b4a 100644 (file)
--- a/term-utils/script.c
+++ b/term-utils/script.c
@@ -164,15 +164,15 @@ static void __attribute__((__noreturn__)) usage(void)
        fputs(_("Make a typescript of a terminal session.\n"), out);
 
        fputs(USAGE_OPTIONS, out);
-       fputs(_(" -a, --append            append the output\n"
-               " -c, --command <command> run command rather than interactive shell\n"
-               " -e, --return            return exit code of the child process\n"
-               " -f, --flush             run flush after each write\n"
-               "     --force             use output file even when it is a link\n"
-               " -q, --quiet             be quiet\n"
-               " -t, --timing[=<file>]   output timing data to stderr (or to FILE)\n"
+       fputs(_(" -a, --append                  append the output\n"
+               " -c, --command <command>       run command rather than interactive shell\n"
+               " -e, --return                  return exit code of the child process\n"
+               " -f, --flush                   run flush after each write\n"
+               "     --force                   use output file even when it is a link\n"
+               " -q, --quiet                   be quiet\n"
+               " -t[<file>], --timing[=<file>] output timing data to stderr or to FILE\n"
                ), out);
-       printf(USAGE_HELP_OPTIONS(25));
+       printf(USAGE_HELP_OPTIONS(31));
 
        printf(USAGE_MAN_TAIL("script(1)"));
        exit(EXIT_SUCCESS);