Unroff all forms of \f and \*, and the simplest form of \s.

Submitted by:	fenner, ru
Reviewed by:	ru, fenner

1 files changed, 14 insertions, 8 deletions

diff --git a/usr.bin/makewhatis/makewhatis.c b/usr.bin/makewhatis/makewhatis.c
index c9a217d..f6dec49 100644
--- a/usr.bin/makewhatis/makewhatis.c
+++ b/usr.bin/makewhatis/makewhatis.c
@@ -498,7 +498,9 @@ name_section_line(char *line, const char *section_start)
 /*
  * Copies characters while removing the most common nroff/troff
  * markup:
- *	\(em, \(mi, \fR, \f(XX, \*p, \&,
+ *	\(em, \(mi, \s[+-N], \&
+ *	\fF, \f(fo, \f[font]
+ *	\*s, \*(st, \*[stringvar]
  */
 static char *
 de_nroff_copy(char *from, char *to, int fromlen)
@@ -515,18 +517,22 @@ de_nroff_copy(char *from, char *to, int fromlen)
 					continue;
 				}
 				break;
+			case 's':
+				if (*++from == '-')
+					from++;
+				while (isdigit(*from))
+					from++;
+				continue;
 			case 'f':
+			case '*':
 				if (*++from == '(')
 					from += 3;
-				else
+				else if (*from == '[') {
+					while (*++from != ']' && from < from_end);
+					from++;
+				} else
 					from++;
 				continue;
-			case '*':
-				if (from[1] == 'p') {
-					from += 2;
-					continue;
-				}
-				break;
 			case '&':
 				from++;
 				continue;