[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Bug#351601: coreutils: minor formatting issue in the mv an cp manpag
From: |
Jim Meyering |
Subject: |
Re: Bug#351601: coreutils: minor formatting issue in the mv an cp manpages |
Date: |
Sat, 18 Feb 2006 08:44:02 +0100 |
Nicolas François <address@hidden> wrote:
...
> I've found some other similar issues in install.c, join.c, pr.c, and uniq.c
>
> I'm attaching a patch for Makefile.maint
Thanks again!
I switched it to use grep's -E, so there aren't so many backslashes
and made it fit within 80 columns.
2006-02-18 Jim Meyering <address@hidden>
* Version 6.0-cvs.
* Makefile.maint (sc_two_space_separator_in_usage): Make the regular
expression match more of the target lines, e.g., those that start with
`-S,' (short option followed by a comma) or that include `=[...]'.
Patch by Nicolas François.
Fix the four offenders thus exposed:
* src/join.c (usage): Use two spaces (not one) to separate the
--first-only option string from its description, so help2man formats
the derived man page properly.
* src/pr.c (usage): Likewise.
* src/uniq.c (usage): Likewise.
* src/install.c (usage): Likewise.
Index: Makefile.maint
===================================================================
RCS file: /fetish/cu/Makefile.maint,v
retrieving revision 1.232
retrieving revision 1.233
diff -u -p -u -r1.232 -r1.233
--- Makefile.maint 15 Feb 2006 08:51:47 -0000 1.232
+++ Makefile.maint 18 Feb 2006 07:40:51 -0000 1.233
@@ -262,8 +262,12 @@ sc_trailing_blank:
{ echo '$(ME): found trailing blank(s)' \
1>&2; exit 1; } || :
+# Match lines like the following, but where there is only one space
+# between the options and the description:
+# -D, --all-repeated[=delimit-method] print all duplicate lines\n
+longopt_re = --[a-z][0-9A-Za-z-]*(\[=[0-9A-Za-z-]*\])?
sc_two_space_separator_in_usage:
- @grep -n '^ *--[a-z][0-9A-Za-z-]* [^ ].*\\$$' \
+ @grep -nE '^ *(-[A-Za-z],)? $(longopt_re) [^ ].*\\$$' \
$$($(CVS_LIST_EXCEPT)) && \
{ echo "$(ME): help2man requires at least two spaces between"; \
echo "$(ME): an option and its description"; \