diff options
| author | jhb <jhb@FreeBSD.org> | 2006-09-28 19:06:20 +0000 |
|---|---|---|
| committer | jhb <jhb@FreeBSD.org> | 2006-09-28 19:06:20 +0000 |
| commit | 181759445845fd7299a5c25b027d80096b7be2d9 (patch) | |
| tree | 02e9ed5d7c7e7b284f11a4985d4bfafa80d91ccf /sys/boot | |
| parent | 5eae8ee0ac0d71104053a951c861a1d656250a3f (diff) | |
| download | FreeBSD-src-181759445845fd7299a5c25b027d80096b7be2d9.zip FreeBSD-src-181759445845fd7299a5c25b027d80096b7be2d9.tar.gz | |
Ignore a sub-topic match if it is inside the command description.
Otherwise, merge-help can get confused by a command description that
includes a word that starts with a capital S.
MFC after: 1 week
Diffstat (limited to 'sys/boot')
| -rw-r--r-- | sys/boot/common/merge_help.awk | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sys/boot/common/merge_help.awk b/sys/boot/common/merge_help.awk index 02fbc4a..1070f73 100644 --- a/sys/boot/common/merge_help.awk +++ b/sys/boot/common/merge_help.awk @@ -25,9 +25,12 @@ BEGIN \ match($0, " T[[:graph:]]+"); T = substr($0, RSTART + 2, RLENGTH - 2); match($0, " S[[:graph:]]+"); + SSTART = RSTART S = (RLENGTH == -1) ? "" : substr($0, RSTART + 2, RLENGTH - 2); match($0, " D[[:graph:]][[:print:]]*$"); D = substr($0, RSTART + 2); + if (SSTART > RSTART) + S = ""; # find a suitable place to store this one... ind++; |
