From 64786948ccb9b01037bdb7fb07ca86ff04b4972c Mon Sep 17 00:00:00 2001
From: John Baldwin <jhb@FreeBSD.org>
Date: Thu, 28 Sep 2006 19:06:20 +0000
Subject: 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
---
 sys/boot/common/merge_help.awk | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'sys')

diff --git a/sys/boot/common/merge_help.awk b/sys/boot/common/merge_help.awk
index 02fbc4ac7b2d..1070f73f1fe9 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++;
-- 
cgit v1.3