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 8614708b4a5167b9529cb203c022b04b2e917c23..490c68e6d0eacc1abe5aa3c281e739ea265ee306 100644 (file)
--- a/man_validate.c
+++ b/man_validate.c
@@ -33,9 +33,10 @@
 #include "roff.h"
 #include "man.h"
 #include "libmandoc.h"
 #include "roff.h"
 #include "man.h"
 #include "libmandoc.h"

+#include "roff_int.h"

 #include "libman.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);
 
 
 typedef        void    (*v_check)(CHKARGS);
 


@@ -98,9 +99,9 @@ static        v_check man_valids[MAN_MAX] = {
 
 
 void
 
 
 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;
        v_check         *cp;
 
        n = man->last;


@@ -116,7 +117,6 @@ man_valid_post(struct man *man)
                check_root(man, n);
                break;
        case ROFFT_EQN:
                check_root(man, n);
                break;
        case ROFFT_EQN:

-               /* FALLTHROUGH */

        case ROFFT_TBL:
                break;
        default:
        case ROFFT_TBL:
                break;
        default:


@@ -206,17 +206,11 @@ post_ft(CHKARGS)
        cp = n->child->string;
        switch (*cp) {
        case '1':
        cp = n->child->string;
        switch (*cp) {
        case '1':

-               /* FALLTHROUGH */

        case '2':
        case '2':

-               /* FALLTHROUGH */

        case '3':
        case '3':

-               /* FALLTHROUGH */

        case '4':
        case '4':

-               /* FALLTHROUGH */

        case 'I':
        case 'I':

-               /* FALLTHROUGH */

        case 'P':
        case 'P':

-               /* FALLTHROUGH */

        case 'R':
                if ('\0' == cp[1])
                        ok = 1;
        case 'R':
                if ('\0' == cp[1])
                        ok = 1;


@@ -256,7 +250,7 @@ check_par(CHKARGS)
        switch (n->type) {
        case ROFFT_BLOCK:
                if (0 == n->body->nchild)
        switch (n->type) {
        case ROFFT_BLOCK:
                if (0 == n->body->nchild)

-                       man_node_delete(man, n);
+                       roff_node_delete(man, n);

                break;
        case ROFFT_BODY:
                if (0 == n->nchild)
                break;
        case ROFFT_BODY:
                if (0 == n->nchild)


@@ -284,7 +278,7 @@ post_IP(CHKARGS)
        switch (n->type) {
        case ROFFT_BLOCK:
                if (0 == n->head->nchild && 0 == n->body->nchild)
        switch (n->type) {
        case ROFFT_BLOCK:
                if (0 == n->head->nchild && 0 == n->body->nchild)

-                       man_node_delete(man, n);
+                       roff_node_delete(man, n);

                break;
        case ROFFT_BODY:
                if (0 == n->parent->head->nchild && 0 == n->nchild)
                break;
        case ROFFT_BODY:
                if (0 == n->parent->head->nchild && 0 == n->nchild)


@@ -300,21 +294,21 @@ post_IP(CHKARGS)
 static void
 post_TH(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);
        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 =
        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;
 
 
        nb = n;
 

-       /* ->TITLE<- MSEC DATE SOURCE VOL */
+       /* ->TITLE<- MSEC DATE OS VOL */

 
        n = n->child;
        if (n && n->string) {
 
        n = n->child;
        if (n && n->string) {


@@ -336,7 +330,7 @@ post_TH(CHKARGS)
                    nb->line, nb->pos, "TH");
        }
 
                    nb->line, nb->pos, "TH");
        }
 

-       /* TITLE ->MSEC<- DATE SOURCE VOL */
+       /* TITLE ->MSEC<- DATE OS VOL */

 
        if (n)
                n = n->next;
 
        if (n)
                n = n->next;


@@ -348,7 +342,7 @@ post_TH(CHKARGS)
                    nb->line, nb->pos, "TH %s", man->meta.title);
        }
 
                    nb->line, nb->pos, "TH %s", man->meta.title);
        }
 

-       /* TITLE MSEC ->DATE<- SOURCE VOL */
+       /* TITLE MSEC ->DATE<- OS VOL */

 
        if (n)
                n = n->next;
 
        if (n)
                n = n->next;


@@ -364,14 +358,14 @@ post_TH(CHKARGS)
                    n ? n->pos : nb->pos, "TH");
        }
 
                    n ? n->pos : nb->pos, "TH");
        }
 

-       /* TITLE MSEC DATE ->SOURCE<- VOL */
+       /* TITLE MSEC DATE ->OS<- VOL */

 
        if (n && (n = n->next))
 
        if (n && (n = n->next))

-               man->meta.source = mandoc_strdup(n->string);
+               man->meta.os = mandoc_strdup(n->string);

        else if (man->defos != NULL)
        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))
        /* If missing, use the default VOL name for MSEC. */
 
        if (n && (n = n->next))


@@ -388,7 +382,7 @@ post_TH(CHKARGS)
         * Remove the `TH' node after we've processed it for our
         * meta-data.
         */
         * 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
 }
 
 static void


@@ -446,8 +440,8 @@ post_UC(CHKARGS)
                        p = bsd_versions[0];
        }
 
                        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
 }
 
 static void


@@ -460,8 +454,8 @@ post_AT(CHKARGS)
            "System V Release 2",
        };
 
            "System V Release 2",
        };
 

+       struct roff_node *nn;

        const char      *p, *s;
        const char      *p, *s;

-       struct man_node *nn;

 
        n = n->child;
 
 
        n = n->child;
 


@@ -485,8 +479,8 @@ post_AT(CHKARGS)
                        p = unix_versions[0];
        }
 
                        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
 }
 
 static void


@@ -498,18 +492,17 @@ post_vs(CHKARGS)
 
        switch (n->parent->tok) {
        case MAN_SH:
 
        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_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.
                 */
                /*
                 * 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;
                break;
        default:
                break;