Remove two useless FATAL errors.

[mandoc.git] / mandoc.c

diff --git a/mandoc.c b/mandoc.c
index da953214354b284b823ced4ec01eb19048ec7564..dd2227299931125b571597d81abe627fa6510c9c 100644 (file)
--- a/mandoc.c
+++ b/mandoc.c
@@ -1,7 +1,7 @@
-/*     $Id: mandoc.c,v 1.72 2013/12/25 22:45:33 schwarze Exp $ */
+/*     $Id: mandoc.c,v 1.83 2014/07/06 19:09:00 schwarze Exp $ */

 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>

- * Copyright (c) 2011, 2012, 2013 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2011, 2012, 2013, 2014 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


@@ -31,6 +31,7 @@
 #include <time.h>
 
 #include "mandoc.h"
 #include <time.h>
 
 #include "mandoc.h"

+#include "mandoc_aux.h"

 #include "libmandoc.h"
 
 #define DATESIZE 32
 #include "libmandoc.h"
 
 #define DATESIZE 32


@@ -40,12 +41,12 @@ static      char    *time2a(time_t);
 
 
 enum mandoc_esc
 
 
 enum mandoc_esc

-mandoc_escape(const char const **end, const char const **start, int *sz)
+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,11 +75,11 @@ mandoc_escape(const char const **end, const char const **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;
                /*
                 * Unicode escapes are defined in groff as \[uXXXX] to
                gly = ESCAPE_SPECIAL;
                /*
                 * Unicode escapes are defined in groff as \[uXXXX] to


@@ -90,7 +91,7 @@ mandoc_escape(const char const **end, const char const **start, int *sz)
                        gly = ESCAPE_UNICODE;
                term = ']';
                break;
                        gly = ESCAPE_UNICODE;
                term = ']';
                break;

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

                if ('\'' != **start)
                        return(ESCAPE_ERROR);
                *start = ++*end;
                if ('\'' != **start)
                        return(ESCAPE_ERROR);
                *start = ++*end;


@@ -104,50 +105,50 @@ mandoc_escape(const char const **end, const char const **start, int *sz)
        /*
         * Escapes taking no arguments at all.
         */
        /*
         * Escapes taking no arguments at all.
         */

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

                /* FALLTHROUGH */
                /* FALLTHROUGH */

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

                return(ESCAPE_IGNORE);
 
        /*
         * The \z escape is supposed to output the following
                return(ESCAPE_IGNORE);
 
        /*
         * 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'):
+       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.
         */
                return(ESCAPE_SKIPCHAR);
 
        /*
         * Handle all triggers matching \X(xy, \Xx, and \X[xxxx], where
         * 'X' is the trigger.  These have opaque sub-strings.
         */

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

                /* FALLTHROUGH */
                /* FALLTHROUGH */

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

                /* FALLTHROUGH */
                /* FALLTHROUGH */

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

                /* FALLTHROUGH */
                /* FALLTHROUGH */

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

                /* FALLTHROUGH */
                /* FALLTHROUGH */

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

                /* FALLTHROUGH */
                /* FALLTHROUGH */

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

                /* FALLTHROUGH */
                /* FALLTHROUGH */

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

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case ('Y'):
+       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,62 +161,59 @@ mandoc_escape(const char const **end, const char const **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'):
+       case 'A':

                /* FALLTHROUGH */
                /* FALLTHROUGH */

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

                /* FALLTHROUGH */
                /* FALLTHROUGH */

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

                /* FALLTHROUGH */
                /* FALLTHROUGH */

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

                /* FALLTHROUGH */
                /* FALLTHROUGH */

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

                /* FALLTHROUGH */
                /* FALLTHROUGH */

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

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case ('Z'):
-               if ('\'' != **start)
+       case 'Z':
+               if ('\0' == **start)

                        return(ESCAPE_ERROR);
                gly = ESCAPE_IGNORE;
                        return(ESCAPE_ERROR);
                gly = ESCAPE_IGNORE;

+               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 ('B'):
+       case 'h':

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case ('h'):
+       case 'H':

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case ('H'):
+       case 'L':

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case ('L'):
+       case 'l':

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case ('l'):
-               gly = ESCAPE_NUMBERED;
+       case 'S':

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case ('S'):
+       case 'v':

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case ('v'):
-               /* FALLTHROUGH */
-       case ('w'):
-               /* FALLTHROUGH */
-       case ('x'):
-               if ('\'' != **start)
+       case 'x':
+               if (strchr(" %&()*+-./0123456789:<=>", **start)) {
+                       ++*end;

                        return(ESCAPE_ERROR);
                        return(ESCAPE_ERROR);

-               if (ESCAPE_ERROR == gly)
-                       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)
                        return(ESCAPE_ERROR);
                (*end)++;
                if ('\0' == **start)
                        return(ESCAPE_ERROR);
                (*end)++;


@@ -231,10 +229,10 @@ mandoc_escape(const char const **end, const char const **start, int *sz)
                        (*end)++;
                return(ESCAPE_NUMBERED);
 
                        (*end)++;
                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. */
                gly = ESCAPE_IGNORE;
 
                /* See +/- counts as a sign. */


@@ -242,15 +240,15 @@ mandoc_escape(const char const **end, const char const **start, int *sz)
                        (*end)++;
 
                switch (**end) {
                        (*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;


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

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

                                return(ESCAPE_ERROR);
                                return(ESCAPE_ERROR);

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

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


@@ -306,7 +304,7 @@ mandoc_escape(const char const **end, const char const **start, int *sz)
        /* Run post-processors. */
 
        switch (gly) {
        /* Run post-processors. */
 
        switch (gly) {

-       case (ESCAPE_FONT):
+       case ESCAPE_FONT:

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


@@ -324,27 +322,27 @@ mandoc_escape(const char const **end, const char const **start, int *sz)
                        break;
 
                switch (**start) {
                        break;
 
                switch (**start) {

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

                        /* FALLTHROUGH */
                        /* FALLTHROUGH */

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

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

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

                        /* FALLTHROUGH */
                        /* FALLTHROUGH */

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

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

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

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

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

                        /* FALLTHROUGH */
                        /* FALLTHROUGH */

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


@@ -355,74 +353,6 @@ mandoc_escape(const char const **end, const char const **start, int *sz)
        return(gly);
 }
 
        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);
-}
-

 /*
  * Parse a quoted or unquoted roff-style request or macro argument.
  * Return a pointer to the parsed argument, which is either the original
 /*
  * Parse a quoted or unquoted roff-style request or macro argument.
  * Return a pointer to the parsed argument, which is either the original


@@ -444,7 +374,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;


@@ -463,14 +393,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++;


@@ -499,7 +429,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)


@@ -513,7 +443,7 @@ 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);
 }


@@ -581,14 +511,14 @@ 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;


@@ -596,10 +526,10 @@ mandoc_normdate(struct mparse *parse, char *in, int ln, int pos)
 }
 
 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)
                return(0);
 
        if (0 == sz)
                return(0);


@@ -610,24 +540,24 @@ 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 ('\"'):
+               case '\"':

                        /* FALLTHROUGH */
                        /* FALLTHROUGH */

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

                        /* FALLTHROUGH */
                        /* FALLTHROUGH */

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

                        /* FALLTHROUGH */
                        /* FALLTHROUGH */

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

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

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

                        /* FALLTHROUGH */
                        /* FALLTHROUGH */

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

                        /* FALLTHROUGH */
                        /* FALLTHROUGH */

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

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