bug#6383: [PATCH] cat: improve documentation

[Chas. Owens]

That would work as well.  I suggested removing the "all" because it
was the simplest solution and would move the text closer to what BSD
uses, but this spells out the behavior explicitly.

On Wed, Jun 9, 2010 at 13:17, Eric Blake <address@hidden> wrote:
> * src/cat.c (usage): Clarify that -b overrides -n.
> * doc/coreutils.texi (cat invocation): Likewise.
> * THANKS: Update.
> Suggested by Chas. Owens, in bug 6383.
> ---
>
>> The -n option is documented as "number all output lines", but when -b
>> is present it only numbers non-blank lines.  The documentation should
>> read "number output lines".
>
> Thanks for the report.  -b in isolation also numbers lines; so it is
> more an issue that -b overrides -n.  How about this patch, instead?
>
>  THANKS             |    1 +
>  doc/coreutils.texi |    3 ++-
>  src/cat.c          |    2 +-
>  3 files changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/THANKS b/THANKS
> index dce3c94..caa40de 100644
> --- a/THANKS
> +++ b/THANKS
> diff --git a/doc/coreutils.texi b/doc/coreutils.texi
> index 26b4eba..b27d9d7 100644
> --- a/doc/coreutils.texi
> +++ b/doc/coreutils.texi
> @@ -1494,7 +1494,8 @@ cat invocation
> address@hidden --number
> address@hidden -n
> address@hidden --number
> -Number all output lines, starting with 1.
> +Number all output lines, starting with 1.  This option is ignored
> +if @option{-b} is in effect.
>
> address@hidden -s
> address@hidden --squeeze-blank
> diff --git a/src/cat.c b/src/cat.c
> index eebfb97..c4a2a9e 100644
> --- a/src/cat.c
> +++ b/src/cat.c
> @@ -92,7 +92,7 @@ Usage: %s [OPTION]... [FILE]...\n\
>  Concatenate FILE(s), or standard input, to standard output.\n\
>  \n\
>   -A, --show-all           equivalent to -vET\n\
> -  -b, --number-nonblank    number nonempty output lines\n\
> +  -b, --number-nonblank    number nonempty output lines, overrides -n\n\
>   -e                       equivalent to -vE\n\
>   -E, --show-ends          display $ at end of each line\n\
>   -n, --number             number all output lines\n\
> --
> 1.7.0.1
>
>



-- 
Chas. Owens
wonkden.net
The most important skill a programmer can have is the ability to read.