add missing HISTORY information

[mandoc.git] / mandoc.c

diff --git a/mandoc.c b/mandoc.c
index b3928ae46c46a555995b4fd4d60ae54046753a66..d265463b4efeb092cf554f41931308e1265a02cf 100644 (file)
--- a/mandoc.c
+++ b/mandoc.c
@@ -1,7 +1,7 @@
-/*     $Id: mandoc.c,v 1.75 2013/12/31 23:23:10 schwarze Exp $ */
+/*     $Id: mandoc.c,v 1.98 2015/11/12 22:44:27 schwarze Exp $ */

 /*
 /*

- * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
- * Copyright (c) 2011, 2012, 2013 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,10 +29,9 @@
 #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);
 


@@ -45,7 +42,7 @@ mandoc_escape(const char **end, const char **start, int *sz)
        const char      *local_start;
        int              local_sz;
        char             term;
        const char      *local_start;
        int              local_sz;
        char             term;

-       enum mandoc_esc  gly; 
+       enum mandoc_esc  gly;

 
        /*
         * When the caller doesn't provide return storage,
 
        /*
         * When the caller doesn't provide return storage,


@@ -74,80 +71,63 @@ mandoc_escape(const char **end, const char **start, int *sz)
         * these, but each eventually returns a substring of the glyph
         * name.
         */
         * these, but each eventually returns a substring of the glyph
         * name.
         */

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

                gly = ESCAPE_SPECIAL;
                *sz = 2;
                break;
                gly = ESCAPE_SPECIAL;
                *sz = 2;
                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' == (*start)[0] && ']' != (*start)[1])
-                       gly = ESCAPE_UNICODE;

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

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

                if ('\'' != **start)
                if ('\'' != **start)

-                       return(ESCAPE_ERROR);
+                       return ESCAPE_ERROR;

                *start = ++*end;
                *start = ++*end;

-               if ('u' == (*start)[0] && '\'' != (*start)[1])
-                       gly = ESCAPE_UNICODE;
-               else
-                       gly = ESCAPE_SPECIAL;
+               gly = ESCAPE_SPECIAL;

                term = '\'';
                break;
 
        /*
         * Escapes taking no arguments at all.
         */
                term = '\'';
                break;
 
        /*
         * Escapes taking no arguments at all.
         */

-       case ('d'):
-               /* FALLTHROUGH */
-       case ('u'):
-               return(ESCAPE_IGNORE);
+       case 'd':
+       case 'u':
+       case ',':
+       case '/':
+               return ESCAPE_IGNORE;

 
        /*
         * The \z escape is supposed to output the following
 
        /*
         * The \z escape is supposed to output the following

-        * character without advancing the cursor position.  
+        * character without advancing the cursor position.

         * Since we are mostly dealing with terminal mode,
         * let us just skip the next character.
         */
         * Since we are mostly dealing with terminal mode,
         * let us just skip the next character.
         */

-       case ('z'):
-               return(ESCAPE_SKIPCHAR);
+       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;
                switch (**start) {
                if (ESCAPE_ERROR == gly)
                        gly = ESCAPE_FONT;
                switch (**start) {

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

                        *start = ++*end;
                        *sz = 2;
                        break;
                        *start = ++*end;
                        *sz = 2;
                        break;

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

                        *start = ++*end;
                        term = ']';
                        break;
                        *start = ++*end;
                        term = ']';
                        break;


@@ -160,66 +140,57 @@ 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 ('B'):
-               /* FALLTHROUGH */
-       case ('D'):
-               /* FALLTHROUGH */
-       case ('o'):
-               /* FALLTHROUGH */
-       case ('R'):
-               /* FALLTHROUGH */
-       case ('w'):
-               /* FALLTHROUGH */
-       case ('X'):
-               /* FALLTHROUGH */
-       case ('Z'):
-               if ('\'' != **start)
-                       return(ESCAPE_ERROR);
+       case 'A':
+       case 'b':
+       case 'D':
+       case 'R':
+       case 'X':
+       case 'Z':

                gly = ESCAPE_IGNORE;
                gly = ESCAPE_IGNORE;

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

                *start = ++*end;
                *start = ++*end;

-               term = '\'';

                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 ('h'):
-               /* FALLTHROUGH */
-       case ('H'):
-               /* FALLTHROUGH */
-       case ('L'):
-               /* FALLTHROUGH */
-       case ('l'):
-               /* FALLTHROUGH */
-       case ('S'):
-               /* FALLTHROUGH */
-       case ('v'):
-               /* FALLTHROUGH */
-       case ('x'):
-               if ('\'' != **start)
-                       return(ESCAPE_ERROR);
+       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;
                gly = ESCAPE_IGNORE;

+               term = **start;

                *start = ++*end;
                *start = ++*end;

-               term = '\'';

                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'):
+       case 'N':

                if ('\0' == **start)
                if ('\0' == **start)

-                       return(ESCAPE_ERROR);
+                       return ESCAPE_ERROR;

                (*end)++;
                if (isdigit((unsigned char)**start)) {
                        *sz = 1;
                (*end)++;
                if (isdigit((unsigned char)**start)) {
                        *sz = 1;

-                       return(ESCAPE_IGNORE);
+                       return ESCAPE_IGNORE;

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


@@ -227,31 +198,37 @@ mandoc_escape(const char **end, const char **start, int *sz)
                *sz = *end - *start;
                if ('\0' != **end)
                        (*end)++;
                *sz = *end - *start;
                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;
 
                /* See +/- counts as a sign. */
                if ('+' == **end || '-' == **end || ASCII_HYPH == **end)
                gly = ESCAPE_IGNORE;
 
                /* See +/- counts as a sign. */
                if ('+' == **end || '-' == **end || ASCII_HYPH == **end)

-                       (*end)++;
+                       *start = ++*end;

 
                switch (**end) {
 
                switch (**end) {

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

                        *start = ++*end;
                        *sz = 2;
                        break;
                        *start = ++*end;
                        *sz = 2;
                        break;

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

                        *start = ++*end;
                        term = ']';
                        break;
                        *start = ++*end;
                        term = ']';
                        break;

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

                        *start = ++*end;
                        term = '\'';
                        break;
                        *start = ++*end;
                        term = '\'';
                        break;

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

                default:
                        *sz = 1;
                        break;
                default:
                        *sz = 1;
                        break;


@@ -280,13 +257,13 @@ mandoc_escape(const char **end, const char **start, int *sz)
        if ('\0' != term) {
                while (**end != term) {
                        switch (**end) {
        if ('\0' != term) {
                while (**end != term) {
                        switch (**end) {

-                       case ('\0'):
-                               return(ESCAPE_ERROR);
-                       case ('\\'):
+                       case '\0':
+                               return ESCAPE_ERROR;
+                       case '\\':

                                (*end)++;
                                if (ESCAPE_ERROR ==
                                    mandoc_escape(end, NULL, NULL))
                                (*end)++;
                                if (ESCAPE_ERROR ==
                                    mandoc_escape(end, NULL, NULL))

-                                       return(ESCAPE_ERROR);
+                                       return ESCAPE_ERROR;

                                break;
                        default:
                                (*end)++;
                                break;
                        default:
                                (*end)++;


@@ -297,14 +274,14 @@ mandoc_escape(const char **end, const char **start, int *sz)
        } else {
                assert(*sz > 0);
                if ((size_t)*sz > strlen(*start))
        } else {
                assert(*sz > 0);
                if ((size_t)*sz > strlen(*start))

-                       return(ESCAPE_ERROR);
+                       return ESCAPE_ERROR;

                *end += *sz;
        }
 
        /* Run post-processors. */
 
        switch (gly) {
                *end += *sz;
        }
 
        /* Run post-processors. */
 
        switch (gly) {

-       case (ESCAPE_FONT):
+       case ESCAPE_FONT:

                if (2 == *sz) {
                        if ('C' == **start) {
                                /*
                if (2 == *sz) {
                        if ('C' == **start) {
                                /*


@@ -322,103 +299,50 @@ mandoc_escape(const char **end, const char **start, int *sz)
                        break;
 
                switch (**start) {
                        break;
 
                switch (**start) {

-               case ('3'):
-                       /* FALLTHROUGH */
-               case ('B'):
+               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):
+       case ESCAPE_SPECIAL:

                if (1 == *sz && 'c' == **start)
                        gly = ESCAPE_NOSPACE;
                if (1 == *sz && 'c' == **start)
                        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;

 }
 
 /*
 }
 
 /*


@@ -442,7 +366,7 @@ 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;
 
        pairs = 0;
        white = 0;


@@ -461,14 +385,14 @@ mandoc_getarg(struct mparse *parse, char **cpp, int ln, int *pos)
                         * backslashes and backslash-t to literal tabs.
                         */
                        switch (cp[1]) {
                         * backslashes and backslash-t to literal tabs.
                         */
                        switch (cp[1]) {

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

                                cp[0] = '\t';
                                /* FALLTHROUGH */
                                cp[0] = '\t';
                                /* FALLTHROUGH */

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

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

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

                                /* Skip escaped blanks. */
                                if (0 == quoted)
                                        cp++;
                                /* Skip escaped blanks. */
                                if (0 == quoted)
                                        cp++;


@@ -497,7 +421,7 @@ 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);

 
        /* NUL-terminate this argument and move to the next one. */
        if (pairs)
 
        /* NUL-terminate this argument and move to the next one. */
        if (pairs)


@@ -511,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


@@ -525,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 *


@@ -545,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:


@@ -552,45 +478,61 @@ time2a(time_t t)
         * up to 2 characters for the day + comma + blank
         * 4 characters for the year and a terminating '\0'
         */
         * up to 2 characters for the day + comma + blank
         * 4 characters for the year and a terminating '\0'
         */

+

        p = buf = mandoc_malloc(10 + 4 + 4 + 1);
 
        p = buf = mandoc_malloc(10 + 4 + 4 + 1);
 

-       if (0 == (ssz = strftime(p, 10 + 1, "%B ", tm)))
+       if ((ssz = strftime(p, 10 + 1, "%B ", tm)) == 0)

                goto fail;
        p += (int)ssz;
 
                goto fail;
        p += (int)ssz;
 

-       if (-1 == (isz = snprintf(p, 4 + 1, "%d, ", tm->tm_mday)))
+       /*
+        * The output format is just "%d" here, not "%2d" or "%02d".
+        * That's also the reason why we can't just format the
+        * date as a whole with "%B %e, %Y" or "%B %d, %Y".
+        * Besides, the present approach is less prone to buffer
+        * overflows, in case anybody should ever introduce the bug
+        * of looking at LC_TIME.
+        */
+
+       if ((isz = snprintf(p, 4 + 1, "%d, ", tm->tm_mday)) == -1)

                goto fail;
        p += isz;
 
                goto fail;
        p += isz;
 

-       if (0 == strftime(p, 4 + 1, "%Y", tm))
+       if (strftime(p, 4 + 1, "%Y", tm) == 0)

                goto fail;
                goto fail;

-       return(buf);
+       return buf;

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

-       return(NULL);
+       return NULL;

 }
 
 char *
 mandoc_normdate(struct mparse *parse, char *in, int ln, int pos)
 {
 }
 
 char *
 mandoc_normdate(struct mparse *parse, char *in, int ln, int pos)
 {

-       char            *out;

        time_t           t;
 
        time_t           t;
 

-       if (NULL == in || '\0' == *in ||
-           0 == strcmp(in, "$" "Mdocdate$")) {
-               mandoc_msg(MANDOCERR_NODATE, 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)) {
-               mandoc_msg(MANDOCERR_BADDATE, parse, ln, pos, NULL);
-               t = 0;
+       /* No date specified: use today's date. */
+
+       if (in == NULL || *in == '\0' || strcmp(in, "$" "Mdocdate$") == 0) {
+               mandoc_msg(MANDOCERR_DATE_MISSING, parse, ln, pos, NULL);
+               return time2a(time(NULL));

        }
        }

-       out = t ? time2a(t) : NULL;
-       return(out ? out : mandoc_strdup(in));
+
+       /* Valid mdoc(7) date format. */
+
+       if (a2time(&t, "$" "Mdocdate: %b %d %Y $", in) ||
+           a2time(&t, "%b %d, %Y", in))
+               return time2a(t);
+
+       /* Do not warn about the legacy man(7) format. */
+
+       if ( ! a2time(&t, "%Y-%m-%d", in))
+               mandoc_msg(MANDOCERR_DATE_BAD, parse, ln, pos, in);
+
+       /* Use any non-mdoc(7) date verbatim. */
+
+       return mandoc_strdup(in);

 }
 
 int
 }
 
 int


@@ -600,7 +542,7 @@ mandoc_eos(const char *p, size_t sz)
        int              enclosed, found;
 
        if (0 == sz)
        int              enclosed, found;
 
        if (0 == sz)

-               return(0);
+               return 0;

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


@@ -611,29 +553,25 @@ mandoc_eos(const char *p, size_t sz)
        enclosed = found = 0;
        for (q = p + (int)sz - 1; q >= p; q--) {
                switch (*q) {
        enclosed = found = 0;
        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);
+       return found && !enclosed;

 }
 
 /*
 }
 
 /*


@@ -648,7 +586,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';


@@ -657,12 +595,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;

 }
 }