Reject the escape sequences \[uD800] to \[uDFFF] in the parser.

[mandoc.git] / man_validate.c

diff --git a/man_validate.c b/man_validate.c
index 93ee9b3f208bb7dd9c64ad3c8649fed2a80ad06a..490c68e6d0eacc1abe5aa3c281e739ea265ee306 100644 (file)
--- a/man_validate.c
+++ b/man_validate.c
@@ -7,9 +7,9 @@
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
  *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHORS DISCLAIM ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR
  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
@@ -28,13 +28,15 @@
 #include <string.h>
 #include <time.h>
 
-#include "man.h"
-#include "mandoc.h"
 #include "mandoc_aux.h"
-#include "libman.h"
+#include "mandoc.h"
+#include "roff.h"
+#include "man.h"
 #include "libmandoc.h"
+#include "roff_int.h"
+#include "libman.h"
 
-#define        CHKARGS   struct man *man, struct man_node *n
+#define        CHKARGS   struct roff_man *man, struct roff_node *n
 
 typedef        void    (*v_check)(CHKARGS);
 
@@ -97,9 +99,9 @@ static        v_check man_valids[MAN_MAX] = {
 
 
 void
-man_valid_post(struct man *man)
+man_valid_post(struct roff_man *man)
 {
-       struct man_node *n;
+       struct roff_node *n;
        v_check         *cp;
 
        n = man->last;
@@ -108,15 +110,14 @@ man_valid_post(struct man *man)
        n->flags |= MAN_VALID;
 
        switch (n->type) {
-       case MAN_TEXT:
+       case ROFFT_TEXT:
                check_text(man, n);
                break;
-       case MAN_ROOT:
+       case ROFFT_ROOT:
                check_root(man, n);
                break;
-       case MAN_EQN:
-               /* FALLTHROUGH */
-       case MAN_TBL:
+       case ROFFT_EQN:
+       case ROFFT_TBL:
                break;
        default:
                cp = man_valids + n->tok;
@@ -186,7 +187,7 @@ static void
 post_UR(CHKARGS)
 {
 
-       if (n->type == MAN_HEAD && n->child == NULL)
+       if (n->type == ROFFT_HEAD && n->child == NULL)
                mandoc_vmsg(MANDOCERR_UR_NOHEAD, man->parse,
                    n->line, n->pos, "UR");
        check_part(man, n);
@@ -205,17 +206,11 @@ post_ft(CHKARGS)
        cp = n->child->string;
        switch (*cp) {
        case '1':
-               /* FALLTHROUGH */
        case '2':
-               /* FALLTHROUGH */
        case '3':
-               /* FALLTHROUGH */
        case '4':
-               /* FALLTHROUGH */
        case 'I':
-               /* FALLTHROUGH */
        case 'P':
-               /* FALLTHROUGH */
        case 'R':
                if ('\0' == cp[1])
                        ok = 1;
@@ -243,7 +238,7 @@ static void
 check_part(CHKARGS)
 {
 
-       if (n->type == MAN_BODY && n->child == NULL)
+       if (n->type == ROFFT_BODY && n->child == NULL)
                mandoc_msg(MANDOCERR_BLK_EMPTY, man->parse,
                    n->line, n->pos, man_macronames[n->tok]);
 }
@@ -253,17 +248,17 @@ check_par(CHKARGS)
 {
 
        switch (n->type) {
-       case MAN_BLOCK:
+       case ROFFT_BLOCK:
                if (0 == n->body->nchild)
-                       man_node_delete(man, n);
+                       roff_node_delete(man, n);
                break;
-       case MAN_BODY:
+       case ROFFT_BODY:
                if (0 == n->nchild)
                        mandoc_vmsg(MANDOCERR_PAR_SKIP,
                            man->parse, n->line, n->pos,
                            "%s empty", man_macronames[n->tok]);
                break;
-       case MAN_HEAD:
+       case ROFFT_HEAD:
                if (n->nchild)
                        mandoc_vmsg(MANDOCERR_ARG_SKIP,
                            man->parse, n->line, n->pos,
@@ -281,11 +276,11 @@ post_IP(CHKARGS)
 {
 
        switch (n->type) {
-       case MAN_BLOCK:
+       case ROFFT_BLOCK:
                if (0 == n->head->nchild && 0 == n->body->nchild)
-                       man_node_delete(man, n);
+                       roff_node_delete(man, n);
                break;
-       case MAN_BODY:
+       case ROFFT_BODY:
                if (0 == n->parent->head->nchild && 0 == n->nchild)
                        mandoc_vmsg(MANDOCERR_PAR_SKIP,
                            man->parse, n->line, n->pos,
@@ -299,21 +294,21 @@ post_IP(CHKARGS)
 static void
 post_TH(CHKARGS)
 {
-       struct man_node *nb;
+       struct roff_node *nb;
        const char      *p;
 
        free(man->meta.title);
        free(man->meta.vol);
-       free(man->meta.source);
+       free(man->meta.os);
        free(man->meta.msec);
        free(man->meta.date);
 
        man->meta.title = man->meta.vol = man->meta.date =
-           man->meta.msec = man->meta.source = NULL;
+           man->meta.msec = man->meta.os = NULL;
 
        nb = n;
 
-       /* ->TITLE<- MSEC DATE SOURCE VOL */
+       /* ->TITLE<- MSEC DATE OS VOL */
 
        n = n->child;
        if (n && n->string) {
@@ -335,7 +330,7 @@ post_TH(CHKARGS)
                    nb->line, nb->pos, "TH");
        }
 
-       /* TITLE ->MSEC<- DATE SOURCE VOL */
+       /* TITLE ->MSEC<- DATE OS VOL */
 
        if (n)
                n = n->next;
@@ -347,7 +342,7 @@ post_TH(CHKARGS)
                    nb->line, nb->pos, "TH %s", man->meta.title);
        }
 
-       /* TITLE MSEC ->DATE<- SOURCE VOL */
+       /* TITLE MSEC ->DATE<- OS VOL */
 
        if (n)
                n = n->next;
@@ -363,14 +358,14 @@ post_TH(CHKARGS)
                    n ? n->pos : nb->pos, "TH");
        }
 
-       /* TITLE MSEC DATE ->SOURCE<- VOL */
+       /* TITLE MSEC DATE ->OS<- VOL */
 
        if (n && (n = n->next))
-               man->meta.source = mandoc_strdup(n->string);
+               man->meta.os = mandoc_strdup(n->string);
        else if (man->defos != NULL)
-               man->meta.source = mandoc_strdup(man->defos);
+               man->meta.os = mandoc_strdup(man->defos);
 
-       /* TITLE MSEC DATE SOURCE ->VOL<- */
+       /* TITLE MSEC DATE OS ->VOL<- */
        /* If missing, use the default VOL name for MSEC. */
 
        if (n && (n = n->next))
@@ -387,7 +382,7 @@ post_TH(CHKARGS)
         * Remove the `TH' node after we've processed it for our
         * meta-data.
         */
-       man_node_delete(man, man->last);
+       roff_node_delete(man, man->last);
 }
 
 static void
@@ -427,7 +422,7 @@ post_UC(CHKARGS)
 
        n = n->child;
 
-       if (NULL == n || MAN_TEXT != n->type)
+       if (n == NULL || n->type != ROFFT_TEXT)
                p = bsd_versions[0];
        else {
                s = n->string;
@@ -445,8 +440,8 @@ post_UC(CHKARGS)
                        p = bsd_versions[0];
        }
 
-       free(man->meta.source);
-       man->meta.source = mandoc_strdup(p);
+       free(man->meta.os);
+       man->meta.os = mandoc_strdup(p);
 }
 
 static void
@@ -459,12 +454,12 @@ post_AT(CHKARGS)
            "System V Release 2",
        };
 
+       struct roff_node *nn;
        const char      *p, *s;
-       struct man_node *nn;
 
        n = n->child;
 
-       if (NULL == n || MAN_TEXT != n->type)
+       if (n == NULL || n->type != ROFFT_TEXT)
                p = unix_versions[0];
        else {
                s = n->string;
@@ -474,7 +469,9 @@ post_AT(CHKARGS)
                        p = unix_versions[1];
                else if (0 == strcmp(s, "5")) {
                        nn = n->next;
-                       if (nn && MAN_TEXT == nn->type && nn->string[0])
+                       if (nn != NULL &&
+                           nn->type == ROFFT_TEXT &&
+                           nn->string[0] != '\0')
                                p = unix_versions[3];
                        else
                                p = unix_versions[2];
@@ -482,8 +479,8 @@ post_AT(CHKARGS)
                        p = unix_versions[0];
        }
 
-       free(man->meta.source);
-       man->meta.source = mandoc_strdup(p);
+       free(man->meta.os);
+       man->meta.os = mandoc_strdup(p);
 }
 
 static void
@@ -495,18 +492,17 @@ post_vs(CHKARGS)
 
        switch (n->parent->tok) {
        case MAN_SH:
-               /* FALLTHROUGH */
        case MAN_SS:
                mandoc_vmsg(MANDOCERR_PAR_SKIP, man->parse, n->line, n->pos,
                    "%s after %s", man_macronames[n->tok],
                    man_macronames[n->parent->tok]);
                /* FALLTHROUGH */
-       case MAN_MAX:
+       case TOKEN_NONE:
                /*
                 * Don't warn about this because it occurs in pod2man
                 * and would cause considerable (unfixable) warnage.
                 */
-               man_node_delete(man, n);
+               roff_node_delete(man, n);
                break;
        default:
                break;