Without HAVE_ERR, don't try to include <err.h>, it probably isn't there.

[mandoc.git] / mandoc.c

diff --git a/mandoc.c b/mandoc.c
index 604bb67e6ae480b8c736a3658fd667207b0c4b9b..1179c09b3636f056c439f28b8ca3b3a2858f6d1e 100644 (file)
--- a/mandoc.c
+++ b/mandoc.c
@@ -1,7 +1,7 @@
-/*     $Id: mandoc.c,v 1.62 2011/12/03 16:08:51 schwarze Exp $ */
+/*     $Id: mandoc.c,v 1.97 2015/10/15 23:35:55 schwarze Exp $ */

 /*
 /*

- * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
- * Copyright (c) 2011 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2008-2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2011-2015 Ingo Schwarze <schwarze@openbsd.org>

  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above


@@ -15,9 +15,7 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */

-#ifdef HAVE_CONFIG_H

 #include "config.h"
 #include "config.h"

-#endif

 
 #include <sys/types.h>
 
 
 #include <sys/types.h>
 


@@ -31,156 +29,110 @@
 #include <time.h>
 
 #include "mandoc.h"
 #include <time.h>
 
 #include "mandoc.h"

+#include "mandoc_aux.h"

 #include "libmandoc.h"
 
 #include "libmandoc.h"
 

-#define DATESIZE 32
-

 static int      a2time(time_t *, const char *, const char *);
 static char    *time2a(time_t);
 static int      a2time(time_t *, const char *, const char *);
 static char    *time2a(time_t);

-static int      numescape(const char *);
-
-/*
- * Pass over recursive numerical expressions.  This context of this
- * function is important: it's only called within character-terminating
- * escapes (e.g., \s[xxxyyy]), so all we need to do is handle initial
- * recursion: we don't care about what's in these blocks. 
- * This returns the number of characters skipped or -1 if an error
- * occurs (the caller should bail).
- */
-static int
-numescape(const char *start)
-{
-       int              i;
-       size_t           sz;
-       const char      *cp;
-
-       i = 0;

 
 

-       /* The expression consists of a subexpression. */
-
-       if ('\\' == start[i]) {
-               cp = &start[++i];
-               /*
-                * Read past the end of the subexpression.
-                * Bail immediately on errors.
-                */
-               if (ESCAPE_ERROR == mandoc_escape(&cp, NULL, NULL))
-                       return(-1);
-               return(i + cp - &start[i]);
-       } 

 
 

-       if ('(' != start[i++])
-               return(0);
+enum mandoc_esc
+mandoc_escape(const char **end, const char **start, int *sz)
+{
+       const char      *local_start;
+       int              local_sz;
+       char             term;
+       enum mandoc_esc  gly;

 
        /*
 
        /*

-        * A parenthesised subexpression.  Read until the closing
-        * parenthesis, making sure to handle any nested subexpressions
-        * that might ruin our parse.
+        * When the caller doesn't provide return storage,
+        * use local storage.

         */
 
         */
 

-       while (')' != start[i]) {
-               sz = strcspn(&start[i], ")\\");
-               i += (int)sz;
-
-               if ('\0' == start[i])
-                       return(-1);
-               else if ('\\' != start[i])
-                       continue;
+       if (NULL == start)
+               start = &local_start;
+       if (NULL == sz)
+               sz = &local_sz;

 
 

-               cp = &start[++i];
-               if (ESCAPE_ERROR == mandoc_escape(&cp, NULL, NULL))
-                       return(-1);
-               i += cp - &start[i];
-       }
-
-       /* Read past the terminating ')'. */
-       return(++i);
-}
+       /*
+        * Beyond the backslash, at least one input character
+        * is part of the escape sequence.  With one exception
+        * (see below), that character won't be returned.
+        */

 
 

-enum mandoc_esc
-mandoc_escape(const char **end, const char **start, int *sz)
-{
-       char             c, term, numeric;
-       int              i, lim, ssz, rlim;
-       const char      *cp, *rstart;
-       enum mandoc_esc  gly; 
-
-       cp = *end;
-       rstart = cp;
-       if (start)
-               *start = rstart;
-       i = lim = 0;

        gly = ESCAPE_ERROR;
        gly = ESCAPE_ERROR;

-       term = numeric = '\0';
+       *start = ++*end;
+       *sz = 0;
+       term = '\0';

 
 

-       switch ((c = cp[i++])) {
+       switch ((*start)[-1]) {

        /*
         * First the glyphs.  There are several different forms of
         * these, but each eventually returns a substring of the glyph
         * name.
         */
        /*
         * First the glyphs.  There are several different forms of
         * these, but each eventually returns a substring of the glyph
         * name.
         */

-       case ('('):
+       case '(':

                gly = ESCAPE_SPECIAL;
                gly = ESCAPE_SPECIAL;

-               lim = 2;
+               *sz = 2;

                break;
                break;

-       case ('['):
+       case '[':

                gly = ESCAPE_SPECIAL;
                gly = ESCAPE_SPECIAL;

-               /*
-                * Unicode escapes are defined in groff as \[uXXXX] to
-                * \[u10FFFF], where the contained value must be a valid
-                * Unicode codepoint.  Here, however, only check whether
-                * it's not a zero-width escape.
-                */
-               if ('u' == cp[i] && ']' != cp[i + 1])
-                       gly = ESCAPE_UNICODE;

                term = ']';
                break;
                term = ']';
                break;

-       case ('C'):
-               if ('\'' != cp[i])
-                       return(ESCAPE_ERROR);
+       case 'C':
+               if ('\'' != **start)
+                       return ESCAPE_ERROR;
+               *start = ++*end;

                gly = ESCAPE_SPECIAL;
                term = '\'';
                break;
 
                gly = ESCAPE_SPECIAL;
                term = '\'';
                break;
 

+       /*
+        * Escapes taking no arguments at all.
+        */
+       case 'd':
+       case 'u':
+       case ',':
+       case '/':
+               return ESCAPE_IGNORE;
+
+       /*
+        * The \z escape is supposed to output the following
+        * character without advancing the cursor position.
+        * Since we are mostly dealing with terminal mode,
+        * let us just skip the next character.
+        */
+       case 'z':
+               return ESCAPE_SKIPCHAR;
+

        /*
         * Handle all triggers matching \X(xy, \Xx, and \X[xxxx], where
         * 'X' is the trigger.  These have opaque sub-strings.
         */
        /*
         * Handle all triggers matching \X(xy, \Xx, and \X[xxxx], where
         * 'X' is the trigger.  These have opaque sub-strings.
         */

-       case ('F'):
-               /* FALLTHROUGH */
-       case ('g'):
-               /* FALLTHROUGH */
-       case ('k'):
-               /* FALLTHROUGH */
-       case ('M'):
-               /* FALLTHROUGH */
-       case ('m'):
-               /* FALLTHROUGH */
-       case ('n'):
-               /* FALLTHROUGH */
-       case ('V'):
-               /* FALLTHROUGH */
-       case ('Y'):
+       case 'F':
+       case 'g':
+       case 'k':
+       case 'M':
+       case 'm':
+       case 'n':
+       case 'V':
+       case 'Y':

                gly = ESCAPE_IGNORE;
                /* FALLTHROUGH */
                gly = ESCAPE_IGNORE;
                /* FALLTHROUGH */

-       case ('f'):
+       case 'f':

                if (ESCAPE_ERROR == gly)
                        gly = ESCAPE_FONT;
                if (ESCAPE_ERROR == gly)
                        gly = ESCAPE_FONT;

-
-               rstart= &cp[i];
-               if (start) 
-                       *start = rstart;
-
-               switch (cp[i++]) {
-               case ('('):
-                       lim = 2;
+               switch (**start) {
+               case '(':
+                       *start = ++*end;
+                       *sz = 2;

                        break;
                        break;

-               case ('['):
+               case '[':
+                       *start = ++*end;

                        term = ']';
                        break;
                default:
                        term = ']';
                        break;
                default:

-                       lim = 1;
-                       i--;
+                       *sz = 1;

                        break;
                }
                break;
                        break;
                }
                break;


@@ -188,306 +140,219 @@ mandoc_escape(const char **end, const char **start, int *sz)
        /*
         * These escapes are of the form \X'Y', where 'X' is the trigger
         * and 'Y' is any string.  These have opaque sub-strings.
        /*
         * These escapes are of the form \X'Y', where 'X' is the trigger
         * and 'Y' is any string.  These have opaque sub-strings.

+        * The \B and \w escapes are handled in roff.c, roff_res().

         */
         */

-       case ('A'):
-               /* FALLTHROUGH */
-       case ('b'):
-               /* FALLTHROUGH */
-       case ('D'):
-               /* FALLTHROUGH */
-       case ('o'):
-               /* FALLTHROUGH */
-       case ('R'):
-               /* FALLTHROUGH */
-       case ('X'):
-               /* FALLTHROUGH */
-       case ('Z'):
-               if ('\'' != cp[i++])
-                       return(ESCAPE_ERROR);
+       case 'A':
+       case 'b':
+       case 'D':
+       case 'R':
+       case 'X':
+       case 'Z':

                gly = ESCAPE_IGNORE;
                gly = ESCAPE_IGNORE;

-               term = '\'';
+               /* FALLTHROUGH */
+       case 'o':
+               if (**start == '\0')
+                       return ESCAPE_ERROR;
+               if (gly == ESCAPE_ERROR)
+                       gly = ESCAPE_OVERSTRIKE;
+               term = **start;
+               *start = ++*end;

                break;
 
        /*
         * These escapes are of the form \X'N', where 'X' is the trigger
         * and 'N' resolves to a numerical expression.
         */
                break;
 
        /*
         * These escapes are of the form \X'N', where 'X' is the trigger
         * and 'N' resolves to a numerical expression.
         */

-       case ('B'):
-               /* FALLTHROUGH */
-       case ('h'):
-               /* FALLTHROUGH */
-       case ('H'):
-               /* FALLTHROUGH */
-       case ('L'):
-               /* FALLTHROUGH */
-       case ('l'):
-               gly = ESCAPE_NUMBERED;
-               /* FALLTHROUGH */
-       case ('S'):
-               /* FALLTHROUGH */
-       case ('v'):
-               /* FALLTHROUGH */
-       case ('w'):
-               /* FALLTHROUGH */
-       case ('x'):
-               if (ESCAPE_ERROR == gly)
-                       gly = ESCAPE_IGNORE;
-               if ('\'' != cp[i++])
-                       return(ESCAPE_ERROR);
-               term = numeric = '\'';
+       case 'h':
+       case 'H':
+       case 'L':
+       case 'l':
+       case 'S':
+       case 'v':
+       case 'x':
+               if (strchr(" %&()*+-./0123456789:<=>", **start)) {
+                       if ('\0' != **start)
+                               ++*end;
+                       return ESCAPE_ERROR;
+               }
+               gly = ESCAPE_IGNORE;
+               term = **start;
+               *start = ++*end;

                break;
 
        /*
         * Special handling for the numbered character escape.
         * XXX Do any other escapes need similar handling?
         */
                break;
 
        /*
         * Special handling for the numbered character escape.
         * XXX Do any other escapes need similar handling?
         */

-       case ('N'):
-               if ('\0' == cp[i])
-                       return(ESCAPE_ERROR);
-               *end = &cp[++i];
-               if (isdigit((unsigned char)cp[i-1]))
-                       return(ESCAPE_IGNORE);
+       case 'N':
+               if ('\0' == **start)
+                       return ESCAPE_ERROR;
+               (*end)++;
+               if (isdigit((unsigned char)**start)) {
+                       *sz = 1;
+                       return ESCAPE_IGNORE;
+               }
+               (*start)++;

                while (isdigit((unsigned char)**end))
                        (*end)++;
                while (isdigit((unsigned char)**end))
                        (*end)++;

-               if (start)
-                       *start = &cp[i];
-               if (sz)
-                       *sz = *end - &cp[i];
+               *sz = *end - *start;

                if ('\0' != **end)
                        (*end)++;
                if ('\0' != **end)
                        (*end)++;

-               return(ESCAPE_NUMBERED);
+               return ESCAPE_NUMBERED;

 
 

-       /* 
+       /*

         * Sizes get a special category of their own.
         */
         * Sizes get a special category of their own.
         */

-       case ('s'):
+       case 's':

                gly = ESCAPE_IGNORE;
 
                gly = ESCAPE_IGNORE;
 

-               rstart = &cp[i];
-               if (start) 
-                       *start = rstart;
-

                /* See +/- counts as a sign. */
                /* See +/- counts as a sign. */

-               c = cp[i];
-               if ('+' == c || '-' == c || ASCII_HYPH == c)
-                       ++i;
+               if ('+' == **end || '-' == **end || ASCII_HYPH == **end)
+                       *start = ++*end;

 
 

-               switch (cp[i++]) {
-               case ('('):
-                       lim = 2;
+               switch (**end) {
+               case '(':
+                       *start = ++*end;
+                       *sz = 2;
+                       break;
+               case '[':
+                       *start = ++*end;
+                       term = ']';

                        break;
                        break;

-               case ('['):
-                       term = numeric = ']';
+               case '\'':
+                       *start = ++*end;
+                       term = '\'';

                        break;
                        break;

-               case ('\''):
-                       term = numeric = '\'';
+               case '3':
+               case '2':
+               case '1':
+                       *sz = (*end)[-1] == 's' &&
+                           isdigit((unsigned char)(*end)[1]) ? 2 : 1;

                        break;
                default:
                        break;
                default:

-                       lim = 1;
-                       i--;
+                       *sz = 1;

                        break;
                }
 
                        break;
                }
 

-               /* See +/- counts as a sign. */
-               c = cp[i];
-               if ('+' == c || '-' == c || ASCII_HYPH == c)
-                       ++i;
-

                break;
 
        /*
         * Anything else is assumed to be a glyph.
                break;
 
        /*
         * Anything else is assumed to be a glyph.

+        * In this case, pass back the character after the backslash.

         */
        default:
                gly = ESCAPE_SPECIAL;
         */
        default:
                gly = ESCAPE_SPECIAL;

-               lim = 1;
-               i--;
+               *start = --*end;
+               *sz = 1;

                break;
        }
 
        assert(ESCAPE_ERROR != gly);
 
                break;
        }
 
        assert(ESCAPE_ERROR != gly);
 

-       rstart = &cp[i];
-       if (start)
-               *start = rstart;
-

        /*
        /*

-        * If a terminating block has been specified, we need to
-        * handle the case of recursion, which could have their
-        * own terminating blocks that mess up our parse.  This, by the
-        * way, means that the "start" and "size" values will be
-        * effectively meaningless.
-        */
-
-       ssz = 0;
-       if (numeric && -1 == (ssz = numescape(&cp[i])))
-               return(ESCAPE_ERROR);
-
-       i += ssz;
-       rlim = -1;
-
-       /*
-        * We have a character terminator.  Try to read up to that
-        * character.  If we can't (i.e., we hit the nil), then return
-        * an error; if we can, calculate our length, read past the
-        * terminating character, and exit.
+        * Read up to the terminating character,
+        * paying attention to nested escapes.

         */
 
        if ('\0' != term) {
         */
 
        if ('\0' != term) {

-               *end = strchr(&cp[i], term);
-               if ('\0' == *end)
-                       return(ESCAPE_ERROR);
-
-               rlim = *end - &cp[i];
-               if (sz)
-                       *sz = rlim;
-               (*end)++;
-               goto out;
+               while (**end != term) {
+                       switch (**end) {
+                       case '\0':
+                               return ESCAPE_ERROR;
+                       case '\\':
+                               (*end)++;
+                               if (ESCAPE_ERROR ==
+                                   mandoc_escape(end, NULL, NULL))
+                                       return ESCAPE_ERROR;
+                               break;
+                       default:
+                               (*end)++;
+                               break;
+                       }
+               }
+               *sz = (*end)++ - *start;
+       } else {
+               assert(*sz > 0);
+               if ((size_t)*sz > strlen(*start))
+                       return ESCAPE_ERROR;
+               *end += *sz;

        }
 
        }
 

-       assert(lim > 0);
-
-       /*
-        * We have a numeric limit.  If the string is shorter than that,
-        * stop and return an error.  Else adjust our endpoint, length,
-        * and return the current glyph.
-        */
-
-       if ((size_t)lim > strlen(&cp[i]))
-               return(ESCAPE_ERROR);
-
-       rlim = lim;
-       if (sz)
-               *sz = rlim;
-
-       *end = &cp[i] + lim;
-
-out:
-       assert(rlim >= 0 && rstart);
-

        /* Run post-processors. */
 
        switch (gly) {
        /* Run post-processors. */
 
        switch (gly) {

-       case (ESCAPE_FONT):
-               /*
-                * Pretend that the constant-width font modes are the
-                * same as the regular font modes.
-                */
-               if (2 == rlim && 'C' == *rstart)
-                       rstart++;
-               else if (1 != rlim)
+       case ESCAPE_FONT:
+               if (2 == *sz) {
+                       if ('C' == **start) {
+                               /*
+                                * Treat constant-width font modes
+                                * just like regular font modes.
+                                */
+                               (*start)++;
+                               (*sz)--;
+                       } else {
+                               if ('B' == (*start)[0] && 'I' == (*start)[1])
+                                       gly = ESCAPE_FONTBI;
+                               break;
+                       }
+               } else if (1 != *sz)

                        break;
 
                        break;
 

-               switch (*rstart) {
-               case ('3'):
-                       /* FALLTHROUGH */
-               case ('B'):
+               switch (**start) {
+               case '3':
+               case 'B':

                        gly = ESCAPE_FONTBOLD;
                        break;
                        gly = ESCAPE_FONTBOLD;
                        break;

-               case ('2'):
-                       /* FALLTHROUGH */
-               case ('I'):
+               case '2':
+               case 'I':

                        gly = ESCAPE_FONTITALIC;
                        break;
                        gly = ESCAPE_FONTITALIC;
                        break;

-               case ('P'):
+               case 'P':

                        gly = ESCAPE_FONTPREV;
                        break;
                        gly = ESCAPE_FONTPREV;
                        break;

-               case ('1'):
-                       /* FALLTHROUGH */
-               case ('R'):
+               case '1':
+               case 'R':

                        gly = ESCAPE_FONTROMAN;
                        break;
                }
                break;
                        gly = ESCAPE_FONTROMAN;
                        break;
                }
                break;

-       case (ESCAPE_SPECIAL):
-               if (1 != rlim)
-                       break;
-               if ('c' == *rstart)
+       case ESCAPE_SPECIAL:
+               if (1 == *sz && 'c' == **start)

                        gly = ESCAPE_NOSPACE;
                        gly = ESCAPE_NOSPACE;

+               /*
+                * Unicode escapes are defined in groff as \[u0000]
+                * to \[u10FFFF], where the contained value must be
+                * a valid Unicode codepoint.  Here, however, only
+                * check the length and range.
+                */
+               if (**start != 'u' || *sz < 5 || *sz > 7)
+                       break;
+               if (*sz == 7 && ((*start)[1] != '1' || (*start)[2] != '0'))
+                       break;
+               if (*sz == 6 && (*start)[1] == '0')
+                       break;
+               if (*sz == 5 && (*start)[1] == 'D' &&
+                   strchr("89ABCDEF", (*start)[2]) != NULL)
+                       break;
+               if ((int)strspn(*start + 1, "0123456789ABCDEFabcdef")
+                   + 1 == *sz)
+                       gly = ESCAPE_UNICODE;

                break;
        default:
                break;
        }
 
                break;
        default:
                break;
        }
 

-       return(gly);
-}
-
-void *
-mandoc_calloc(size_t num, size_t size)
-{
-       void            *ptr;
-
-       ptr = calloc(num, size);
-       if (NULL == ptr) {
-               perror(NULL);
-               exit((int)MANDOCLEVEL_SYSERR);
-       }
-
-       return(ptr);
-}
-
-
-void *
-mandoc_malloc(size_t size)
-{
-       void            *ptr;
-
-       ptr = malloc(size);
-       if (NULL == ptr) {
-               perror(NULL);
-               exit((int)MANDOCLEVEL_SYSERR);
-       }
-
-       return(ptr);
-}
-
-
-void *
-mandoc_realloc(void *ptr, size_t size)
-{
-
-       ptr = realloc(ptr, size);
-       if (NULL == ptr) {
-               perror(NULL);
-               exit((int)MANDOCLEVEL_SYSERR);
-       }
-
-       return(ptr);
-}
-
-char *
-mandoc_strndup(const char *ptr, size_t sz)
-{
-       char            *p;
-
-       p = mandoc_malloc(sz + 1);
-       memcpy(p, ptr, sz);
-       p[(int)sz] = '\0';
-       return(p);
-}
-
-char *
-mandoc_strdup(const char *ptr)
-{
-       char            *p;
-
-       p = strdup(ptr);
-       if (NULL == p) {
-               perror(NULL);
-               exit((int)MANDOCLEVEL_SYSERR);
-       }
-
-       return(p);
+       return gly;

 }
 
 /*
  * Parse a quoted or unquoted roff-style request or macro argument.
  * Return a pointer to the parsed argument, which is either the original
  * pointer or advanced by one byte in case the argument is quoted.
 }
 
 /*
  * Parse a quoted or unquoted roff-style request or macro argument.
  * Return a pointer to the parsed argument, which is either the original
  * pointer or advanced by one byte in case the argument is quoted.

- * Null-terminate the argument in place.
+ * NUL-terminate the argument in place.

  * Collapse pairs of quotes inside quoted arguments.
  * Advance the argument pointer to the next argument,
  * Collapse pairs of quotes inside quoted arguments.
  * Advance the argument pointer to the next argument,

- * or to the null byte terminating the argument line.
+ * or to the NUL byte terminating the argument line.

  */
 char *
 mandoc_getarg(struct mparse *parse, char **cpp, int ln, int *pos)
  */
 char *
 mandoc_getarg(struct mparse *parse, char **cpp, int ln, int *pos)


@@ -501,22 +366,40 @@ mandoc_getarg(struct mparse *parse, char **cpp, int ln, int *pos)
        if ('"' == *start) {
                quoted = 1;
                start++;
        if ('"' == *start) {
                quoted = 1;
                start++;

-       } 
+       }

 
        pairs = 0;
        white = 0;
        for (cp = start; '\0' != *cp; cp++) {
 
        pairs = 0;
        white = 0;
        for (cp = start; '\0' != *cp; cp++) {

-               /* Move left after quoted quotes and escaped backslashes. */
+
+               /*
+                * Move the following text left
+                * after quoted quotes and after "\\" and "\t".
+                */

                if (pairs)
                        cp[-pairs] = cp[0];
                if (pairs)
                        cp[-pairs] = cp[0];

+

                if ('\\' == cp[0]) {
                if ('\\' == cp[0]) {

-                       if ('\\' == cp[1]) {
-                               /* Poor man's copy mode. */
+                       /*
+                        * In copy mode, translate double to single
+                        * backslashes and backslash-t to literal tabs.
+                        */
+                       switch (cp[1]) {
+                       case 't':
+                               cp[0] = '\t';
+                               /* FALLTHROUGH */
+                       case '\\':

                                pairs++;
                                cp++;
                                pairs++;
                                cp++;

-                       } else if (0 == quoted && ' ' == cp[1])
+                               break;
+                       case ' ':

                                /* Skip escaped blanks. */
                                /* Skip escaped blanks. */

-                               cp++;
+                               if (0 == quoted)
+                                       cp++;
+                               break;
+                       default:
+                               break;
+                       }

                } else if (0 == quoted) {
                        if (' ' == cp[0]) {
                                /* Unescaped blanks end unquoted args. */
                } else if (0 == quoted) {
                        if (' ' == cp[0]) {
                                /* Unescaped blanks end unquoted args. */


@@ -538,9 +421,9 @@ mandoc_getarg(struct mparse *parse, char **cpp, int ln, int *pos)
 
        /* Quoted argument without a closing quote. */
        if (1 == quoted)
 
        /* Quoted argument without a closing quote. */
        if (1 == quoted)

-               mandoc_msg(MANDOCERR_BADQUOTE, parse, ln, *pos, NULL);
+               mandoc_msg(MANDOCERR_ARG_QUOTE, parse, ln, *pos, NULL);

 
 

-       /* Null-terminate this argument and move to the next one. */
+       /* NUL-terminate this argument and move to the next one. */

        if (pairs)
                cp[-pairs] = '\0';
        if ('\0' != *cp) {
        if (pairs)
                cp[-pairs] = '\0';
        if ('\0' != *cp) {


@@ -552,9 +435,9 @@ mandoc_getarg(struct mparse *parse, char **cpp, int ln, int *pos)
        *cpp = cp;
 
        if ('\0' == *cp && (white || ' ' == cp[-1]))
        *cpp = cp;
 
        if ('\0' == *cp && (white || ' ' == cp[-1]))

-               mandoc_msg(MANDOCERR_EOLNSPACE, parse, ln, *pos, NULL);
+               mandoc_msg(MANDOCERR_SPACE_EOL, parse, ln, *pos, NULL);

 
 

-       return(start);
+       return start;

 }
 
 static int
 }
 
 static int


@@ -566,15 +449,15 @@ a2time(time_t *t, const char *fmt, const char *p)
        memset(&tm, 0, sizeof(struct tm));
 
        pp = NULL;
        memset(&tm, 0, sizeof(struct tm));
 
        pp = NULL;

-#ifdef HAVE_STRPTIME
+#if HAVE_STRPTIME

        pp = strptime(p, fmt, &tm);
 #endif
        if (NULL != pp && '\0' == *pp) {
                *t = mktime(&tm);
        pp = strptime(p, fmt, &tm);
 #endif
        if (NULL != pp && '\0' == *pp) {
                *t = mktime(&tm);

-               return(1);
+               return 1;

        }
 
        }
 

-       return(0);
+       return 0;

 }
 
 static char *
 }
 
 static char *


@@ -586,6 +469,8 @@ time2a(time_t t)
        int              isz;
 
        tm = localtime(&t);
        int              isz;
 
        tm = localtime(&t);

+       if (tm == NULL)
+               return NULL;

 
        /*
         * Reserve space:
 
        /*
         * Reserve space:


@@ -605,11 +490,11 @@ time2a(time_t t)
 
        if (0 == strftime(p, 4 + 1, "%Y", tm))
                goto fail;
 
        if (0 == strftime(p, 4 + 1, "%Y", tm))
                goto fail;

-       return(buf);
+       return buf;

 
 fail:
        free(buf);
 
 fail:
        free(buf);

-       return(NULL);
+       return NULL;

 }
 
 char *
 }
 
 char *


@@ -620,28 +505,28 @@ mandoc_normdate(struct mparse *parse, char *in, int ln, int pos)
 
        if (NULL == in || '\0' == *in ||
            0 == strcmp(in, "$" "Mdocdate$")) {
 
        if (NULL == in || '\0' == *in ||
            0 == strcmp(in, "$" "Mdocdate$")) {

-               mandoc_msg(MANDOCERR_NODATE, parse, ln, pos, NULL);
+               mandoc_msg(MANDOCERR_DATE_MISSING, parse, ln, pos, NULL);

                time(&t);
        }
        else if (a2time(&t, "%Y-%m-%d", in))
                t = 0;
        else if (!a2time(&t, "$" "Mdocdate: %b %d %Y $", in) &&
            !a2time(&t, "%b %d, %Y", in)) {
                time(&t);
        }
        else if (a2time(&t, "%Y-%m-%d", in))
                t = 0;
        else if (!a2time(&t, "$" "Mdocdate: %b %d %Y $", in) &&
            !a2time(&t, "%b %d, %Y", in)) {

-               mandoc_msg(MANDOCERR_BADDATE, parse, ln, pos, NULL);
+               mandoc_msg(MANDOCERR_DATE_BAD, parse, ln, pos, in);

                t = 0;
        }
        out = t ? time2a(t) : NULL;
                t = 0;
        }
        out = t ? time2a(t) : NULL;

-       return(out ? out : mandoc_strdup(in));
+       return out ? out : mandoc_strdup(in);

 }
 
 int
 }
 
 int

-mandoc_eos(const char *p, size_t sz, int enclosed)
+mandoc_eos(const char *p, size_t sz)

 {
 {

-       const char *q;
-       int found;
+       const char      *q;
+       int              enclosed, found;

 
        if (0 == sz)
 
        if (0 == sz)

-               return(0);
+               return 0;

 
        /*
         * End-of-sentence recognition must include situations where
 
        /*
         * End-of-sentence recognition must include situations where


@@ -649,58 +534,28 @@ mandoc_eos(const char *p, size_t sz, int enclosed)
         * propagate outward.
         */
 
         * propagate outward.
         */
 

-       found = 0;
+       enclosed = found = 0;

        for (q = p + (int)sz - 1; q >= p; q--) {
                switch (*q) {
        for (q = p + (int)sz - 1; q >= p; q--) {
                switch (*q) {

-               case ('\"'):
-                       /* FALLTHROUGH */
-               case ('\''):
-                       /* FALLTHROUGH */
-               case (']'):
-                       /* FALLTHROUGH */
-               case (')'):
+               case '\"':
+               case '\'':
+               case ']':
+               case ')':

                        if (0 == found)
                                enclosed = 1;
                        break;
                        if (0 == found)
                                enclosed = 1;
                        break;

-               case ('.'):
-                       /* FALLTHROUGH */
-               case ('!'):
-                       /* FALLTHROUGH */
-               case ('?'):
+               case '.':
+               case '!':
+               case '?':

                        found = 1;
                        break;
                default:
                        found = 1;
                        break;
                default:

-                       return(found && (!enclosed || isalnum((unsigned char)*q)));
+                       return found &&
+                           (!enclosed || isalnum((unsigned char)*q));

                }
        }
 
                }
        }
 

-       return(found && !enclosed);
-}
-
-/*
- * Find out whether a line is a macro line or not.  If it is, adjust the
- * current position and return one; if it isn't, return zero and don't
- * change the current position.
- */
-int
-mandoc_getcontrol(const char *cp, int *ppos)
-{
-       int             pos;
-
-       pos = *ppos;
-
-       if ('\\' == cp[pos] && '.' == cp[pos + 1])
-               pos += 2;
-       else if ('.' == cp[pos] || '\'' == cp[pos])
-               pos++;
-       else
-               return(0);
-
-       while (' ' == cp[pos] || '\t' == cp[pos])
-               pos++;
-
-       *ppos = pos;
-       return(1);
+       return found && !enclosed;

 }
 
 /*
 }
 
 /*


@@ -715,7 +570,7 @@ mandoc_strntoi(const char *p, size_t sz, int base)
        long             v;
 
        if (sz > 31)
        long             v;
 
        if (sz > 31)

-               return(-1);
+               return -1;

 
        memcpy(buf, p, sz);
        buf[(int)sz] = '\0';
 
        memcpy(buf, p, sz);
        buf[(int)sz] = '\0';


@@ -724,12 +579,12 @@ mandoc_strntoi(const char *p, size_t sz, int base)
        v = strtol(buf, &ep, base);
 
        if (buf[0] == '\0' || *ep != '\0')
        v = strtol(buf, &ep, base);
 
        if (buf[0] == '\0' || *ep != '\0')

-               return(-1);
+               return -1;

 
        if (v > INT_MAX)
                v = INT_MAX;
        if (v < INT_MIN)
                v = INT_MIN;
 
 
        if (v > INT_MAX)
                v = INT_MAX;
        if (v < INT_MIN)
                v = INT_MIN;
 

-       return((int)v);
+       return (int)v;

 }
 }