=================================================================== RCS file: /cvs/mandoc/roff.c,v retrieving revision 1.33 retrieving revision 1.37 diff -u -p -r1.33 -r1.37 --- mandoc/roff.c 2008/12/02 13:20:24 1.33 +++ mandoc/roff.c 2008/12/04 16:19:52 1.37 @@ -1,4 +1,4 @@ -/* $Id: roff.c,v 1.33 2008/12/02 13:20:24 kristaps Exp $ */ +/* $Id: roff.c,v 1.37 2008/12/04 16:19:52 kristaps Exp $ */ /* * Copyright (c) 2008 Kristaps Dzonsons * @@ -40,9 +40,8 @@ /* TODO: (warn) NAME section has particular order. */ /* TODO: unify empty-content tags a la
. */ /* TODO: macros with a set number of arguments? */ +/* TODO: validate Dt macro arguments. */ -#define ROFF_MAXARG 32 - enum roffd { ROFF_ENTER = 0, ROFF_EXIT @@ -132,11 +131,12 @@ static int roffparseopts(struct rofftree *, int, char ***, int *, char **); static int roffcall(struct rofftree *, int, char **); static int roffparse(struct rofftree *, char *); -static int textparse(const struct rofftree *, char *); +static int textparse(struct rofftree *, char *); +static int roffdata(struct rofftree *, int, char *); -#ifdef __linux__ -static size_t strlcat(char *, const char *, size_t); -static size_t strlcpy(char *, const char *, size_t); +#ifdef __linux__ +extern size_t strlcat(char *, const char *, size_t); +extern size_t strlcpy(char *, const char *, size_t); extern int vsnprintf(char *, size_t, const char *, va_list); extern char *strptime(const char *, const char *, @@ -271,8 +271,8 @@ static const struct rofftok tokens[ROFF_MAX] = { { roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Sy */ { roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Tn */ { roff_text, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED }, /* Ux */ - { NULL, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Xc */ - { NULL, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Xo */ + { NULL, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Xc */ + { NULL, NULL, NULL, NULL, 0, ROFF_TEXT, ROFF_PARSED | ROFF_CALLABLE }, /* Xo */ { roff_layout, NULL, NULL, roffchild_Fo, 0, ROFF_LAYOUT, 0 }, /* Fo */ { roff_noop, NULL, roffparent_Fc, NULL, ROFF_Fo, ROFF_LAYOUT, 0 }, /* Fc */ { roff_layout, NULL, NULL, NULL, 0, ROFF_LAYOUT, 0 }, /* Oo */ @@ -449,14 +449,43 @@ roff_engine(struct rofftree *tree, char *buf) static int -textparse(const struct rofftree *tree, char *buf) +textparse(struct rofftree *tree, char *buf) { + char *bufp; + /* TODO: literal parsing. */ + if ( ! (ROFF_BODY & tree->state)) { roff_err(tree, buf, "data not in body"); return(0); } - return((*tree->cb.roffdata)(tree->arg, 1, buf)); + + /* LINTED */ + while (*buf) { + while (*buf && isspace(*buf)) + buf++; + + if (0 == *buf) + break; + + bufp = buf++; + + while (*buf && ! isspace(*buf)) + buf++; + + if (0 != *buf) { + *buf++ = 0; + if ( ! roffdata(tree, 1, bufp)) + return(0); + continue; + } + + if ( ! roffdata(tree, 1, bufp)) + return(0); + break; + } + + return(1); } @@ -473,7 +502,7 @@ roffargs(const struct rofftree *tree, p = buf; /* LINTED */ - for (i = 0; *buf && i < ROFF_MAXARG; i++) { + for (i = 0; *buf && i < ROFF_MAXLINEARG; i++) { if ('\"' == *buf) { argv[i] = ++buf; while (*buf && '\"' != *buf) @@ -498,7 +527,7 @@ roffargs(const struct rofftree *tree, } assert(i > 0); - if (ROFF_MAXARG == i && *buf) { + if (ROFF_MAXLINEARG == i && *buf) { roff_err(tree, p, "too many arguments for `%s'", toknames [tok]); return(0); @@ -529,7 +558,7 @@ roffparse(struct rofftree *tree, char *buf) { int tok, t; struct roffnode *n; - char *argv[ROFF_MAXARG]; + char *argv[ROFF_MAXLINEARG]; char **argvp; if (0 != *buf && 0 != *(buf + 1) && 0 != *(buf + 2)) @@ -906,7 +935,7 @@ roffpurgepunct(struct rofftree *tree, char **argv) /* LINTED */ while (argv[i]) - if ( ! (*tree->cb.roffdata)(tree->arg, 0, argv[i++])) + if ( ! roffdata(tree, 0, argv[i++])) return(0); return(1); } @@ -937,6 +966,23 @@ roffparseopts(struct rofftree *tree, int tok, } +static int +roffdata(struct rofftree *tree, int space, char *buf) +{ + int tok; + + if (-1 == (tok = rofftok_scan(buf))) { + roff_err(tree, buf, "invalid character sequence"); + return(0); + } else if (ROFFTok_MAX != tok) + return((*tree->cb.rofftoken) + (tree->arg, space != 0, tok)); + + return((*tree->cb.roffdata)(tree->arg, + space != 0, tree->cur, buf)); +} + + /* ARGSUSED */ static int roff_Dd(ROFFCALL_ARGS) @@ -965,7 +1011,7 @@ roff_Dd(ROFFCALL_ARGS) argv++; - if (0 == strcmp(*argv, "$Mdocdate: December 2 2008 $")) { + if (0 == strcmp(*argv, "$Mdocdate: December 4 2008 $")) { t = time(NULL); if (NULL == localtime_r(&t, &tree->tm)) err(1, "localtime_r"); @@ -1107,11 +1153,9 @@ roff_Sm(ROFFCALL_ARGS) tok, argcp, argvp, morep)) return(0); - while (*argv) { - if ((*tree->cb.roffdata)(tree->arg, 1, *argv++)) - continue; - return(0); - } + while (*argv) + if ( ! roffdata(tree, 1, *argv++)) + return(0); return(1); } @@ -1142,18 +1186,19 @@ roff_Ns(ROFFCALL_ARGS) } if ( ! roffispunct(*argv)) { - if ((*tree->cb.roffdata)(tree->arg, 1, *argv++)) - continue; - return(0); + if ( ! roffdata(tree, 1, *argv++)) + return(0); + continue; } + for (j = 0; argv[j]; j++) if ( ! roffispunct(argv[j])) break; if (argv[j]) { - if ((*tree->cb.roffdata)(tree->arg, 0, *argv++)) - continue; - return(0); + if ( ! roffdata(tree, 0, *argv++)) + return(0); + continue; } break; @@ -1210,7 +1255,9 @@ roff_Os(ROFFCALL_ARGS) assert(NULL == tree->last); - return((*tree->cb.roffhead)(tree->arg)); + return((*tree->cb.roffhead)(tree->arg, &tree->tm, + tree->os, tree->title, tree->section, + tree->volume)); } @@ -1218,8 +1265,8 @@ roff_Os(ROFFCALL_ARGS) static int roff_layout(ROFFCALL_ARGS) { - int i, c, argcp[ROFF_MAXARG]; - char *argvp[ROFF_MAXARG]; + int i, c, argcp[ROFF_MAXLINEARG]; + char *argvp[ROFF_MAXLINEARG]; if (ROFF_PRELUDE & tree->state) { roff_err(tree, *argv, "bad `%s' in prelude", @@ -1227,6 +1274,8 @@ roff_layout(ROFFCALL_ARGS) return(0); } else if (ROFF_EXIT == type) { roffnode_free(tree); + if ( ! (*tree->cb.roffblkbodyout)(tree->arg, tok)) + return(0); return((*tree->cb.roffblkout)(tree->arg, tok)); } @@ -1248,8 +1297,10 @@ roff_layout(ROFFCALL_ARGS) if ( ! (*tree->cb.roffblkin)(tree->arg, tok, argcp, argvp)) return(0); if (NULL == *argv) - return(1); - if ( ! (*tree->cb.roffin)(tree->arg, tok, argcp, argvp)) + return((*tree->cb.roffblkbodyin) + (tree->arg, tok, argcp, argvp)); + + if ( ! (*tree->cb.roffblkheadin)(tree->arg, tok, argcp, argvp)) return(0); /* @@ -1259,12 +1310,14 @@ roff_layout(ROFFCALL_ARGS) if ( ! (ROFF_PARSED & tokens[tok].flags)) { i = 0; - while (*argv) { - if ( ! (*tree->cb.roffdata)(tree->arg, i, *argv++)) + while (*argv) + if ( ! roffdata(tree, i++, *argv++)) return(0); - i = 1; - } - return((*tree->cb.roffout)(tree->arg, tok)); + + if ( ! (*tree->cb.roffblkheadout)(tree->arg, tok)) + return(0); + return((*tree->cb.roffblkbodyin) + (tree->arg, tok, argcp, argvp)); } /* @@ -1276,10 +1329,8 @@ roff_layout(ROFFCALL_ARGS) while (*argv) { if (ROFF_MAX == (c = rofffindcallable(*argv))) { assert(tree->arg); - if ( ! (*tree->cb.roffdata) - (tree->arg, i, *argv++)) + if ( ! roffdata(tree, i++, *argv++)) return(0); - i = 1; continue; } if ( ! roffcall(tree, c, argv)) @@ -1293,8 +1344,12 @@ roff_layout(ROFFCALL_ARGS) * macro. */ - if (NULL == *argv) - return((*tree->cb.roffout)(tree->arg, tok)); + if (NULL == *argv) { + if ( ! (*tree->cb.roffblkheadout)(tree->arg, tok)) + return(0); + return((*tree->cb.roffblkbodyin) + (tree->arg, tok, argcp, argvp)); + } /* * Expensive. Scan to the end of line then work backwards until @@ -1304,7 +1359,10 @@ roff_layout(ROFFCALL_ARGS) if ( ! roffpurgepunct(tree, argv)) return(0); - return((*tree->cb.roffout)(tree->arg, tok)); + if ( ! (*tree->cb.roffblkheadout)(tree->arg, tok)) + return(0); + return((*tree->cb.roffblkbodyin) + (tree->arg, tok, argcp, argvp)); } @@ -1312,8 +1370,8 @@ roff_layout(ROFFCALL_ARGS) static int roff_text(ROFFCALL_ARGS) { - int i, j, first, c, argcp[ROFF_MAXARG]; - char *argvp[ROFF_MAXARG]; + int i, j, first, c, argcp[ROFF_MAXLINEARG]; + char *argvp[ROFF_MAXLINEARG]; if (ROFF_PRELUDE & tree->state) { roff_err(tree, *argv, "`%s' disallowed in prelude", @@ -1333,11 +1391,10 @@ roff_text(ROFFCALL_ARGS) if ( ! (ROFF_PARSED & tokens[tok].flags)) { i = 0; - while (*argv) { - if ( ! (*tree->cb.roffdata)(tree->arg, i, *argv++)) + while (*argv) + if ( ! roffdata(tree, i++, *argv++)) return(0); - i = 1; - } + return((*tree->cb.roffout)(tree->arg, tok)); } @@ -1366,9 +1423,8 @@ roff_text(ROFFCALL_ARGS) } if ( ! roffispunct(*argv)) { - if ( ! (*tree->cb.roffdata)(tree->arg, i, *argv++)) + if ( ! roffdata(tree, i++, *argv++)) return(0); - i = 1; continue; } @@ -1378,7 +1434,7 @@ roff_text(ROFFCALL_ARGS) break; if (argv[j]) { - if ( ! (*tree->cb.roffdata)(tree->arg, 0, *argv++)) + if ( ! roffdata(tree, 0, *argv++)) return(0); continue; } @@ -1445,80 +1501,3 @@ roff_err(const struct rofftree *tree, const char *pos, ROFF_ERROR, tree->cur, pos, buf); } - -#ifdef __linux -/* $OpenBSD: roff.c,v 1.33 2008/12/02 13:20:24 kristaps Exp $ */ - -/* - * Copyright (c) 1998 Todd C. Miller - * - * Permission to use, copy, modify, and distribute this software for any - * 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 WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE - * AUTHOR 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 OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ -static size_t -strlcat(char *dst, const char *src, size_t siz) -{ - char *d = dst; - const char *s = src; - size_t n = siz; - size_t dlen; - - /* Find the end of dst and adjust bytes left but don't go past - * end */ - while (n-- != 0 && *d != '\0') - d++; - dlen = d - dst; - n = siz - dlen; - - if (n == 0) - return(dlen + strlen(s)); - while (*s != '\0') { - if (n != 1) { - *d++ = *s; - n--; - } - s++; - } - *d = '\0'; - - return(dlen + (s - src)); /* count does not include NUL */ -} - - -static size_t -strlcpy(char *dst, const char *src, size_t siz) -{ - char *d = dst; - const char *s = src; - size_t n = siz; - - /* Copy as many bytes as will fit */ - if (n != 0) { - while (--n != 0) { - if ((*d++ = *s++) == '\0') - break; - } - } - - /* Not enough room in dst, add NUL and traverse rest of src */ - if (n == 0) { - if (siz != 0) - *d = '\0'; /* NUL-terminate dst */ - while (*s++) - ; - } - - return(s - src - 1); /* count does not include NUL */ -} -#endif /*__linux__*/