OpenBSD src/sbin was used as a tool to hunt bugs in mandoc.

[mandoc.git] / man.c

diff --git a/man.c b/man.c
index 9439d755334d5e001474d9a4dbeab539f25d02f3..d0e577a644ddd2c0d765f014cc121d3a4ed90a0a 100644 (file)
--- a/man.c
+++ b/man.c
@@ -1,4 +1,4 @@
-/*     $Id: man.c,v 1.83 2010/07/18 17:00:26 schwarze Exp $ */
+/*     $Id: man.c,v 1.86 2010/08/08 14:51:32 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -21,7 +21,6 @@
 #include <sys/types.h>
 
 #include <assert.h>
-#include <ctype.h>
 #include <stdarg.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -41,6 +40,7 @@ const char *const __man_macronames[MAN_MAX] = {
        "nf",           "fi",           "r",            "RE",
        "RS",           "DT",           "UC",           "PD",
        "Sp",           "Vb",           "Ve",           "AT",
+       "in"
        };
 
 const  char * const *man_macronames = __man_macronames;
@@ -480,23 +480,14 @@ man_pmacro(struct man *m, int ln, char *buf, int offs)
 
        ppos = i;
 
-       /* Copy the first word into a nil-terminated buffer. */
-
-       for (j = 0; j < 4; j++, i++) {
-               if ('\0' == (mac[j] = buf[i]))
-                       break;
-               else if (' ' == buf[i])
-                       break;
-
-               /* Check for invalid characters. */
-
-               if (isgraph((u_char)buf[i]))
-                       continue;
-               if ( ! man_pmsg(m, ln, i, MANDOCERR_BADCHAR))
-                       return(0);
-               i--;
-       }
+       /*
+        * Copy the first word into a nil-terminated buffer.
+        * Stop copying when a tab, space, or eoln is encountered.
+        */
 
+       j = 0;
+       while (j < 4 && '\0' != buf[i] && ' ' != buf[i] && '\t' != buf[i])
+               mac[j++] = buf[i++];
        mac[j] = '\0';
 
        if (j == 4 || j < 1) {