=================================================================== RCS file: /cvs/mandoc/mdoc_argv.c,v retrieving revision 1.1 retrieving revision 1.14 diff -u -p -r1.1 -r1.14 --- mandoc/mdoc_argv.c 2009/03/27 15:00:15 1.1 +++ mandoc/mdoc_argv.c 2009/07/17 10:56:57 1.14 @@ -1,26 +1,23 @@ -/* $Id: mdoc_argv.c,v 1.1 2009/03/27 15:00:15 kristaps Exp $ */ +/* $Id: mdoc_argv.c,v 1.14 2009/07/17 10:56:57 kristaps Exp $ */ /* - * Copyright (c) 2008, 2009 Kristaps Dzonsons + * Copyright (c) 2008, 2009 Kristaps Dzonsons * * 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. + * 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. + * 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. */ #include #include #include -#include #include #include #include @@ -35,6 +32,8 @@ * There's no limit to the number or arguments that may be allocated. */ +/* FIXME .Bf Li raises "macro-like parameter". */ + #define ARGS_QUOTED (1 << 0) #define ARGS_DELIM (1 << 1) #define ARGS_TABSEP (1 << 2) @@ -47,18 +46,6 @@ #define MULTI_STEP 5 -enum mwarn { - WQUOTPARM, - WARGVPARM, - WCOLEMPTY, - WTAILWS -}; - -enum merr { - EQUOTTERM, - EARGVAL -}; - static int argv_a2arg(int, const char *); static int args(struct mdoc *, int, int *, char *, int, char **); @@ -70,8 +57,6 @@ static int argv_opt_single(struct mdoc *, int, struct mdoc_argv *, int *, char *); static int argv_multi(struct mdoc *, int, struct mdoc_argv *, int *, char *); -static int pwarn(struct mdoc *, int, int, enum mwarn); -static int perr(struct mdoc *, int, int, enum merr); /* Per-argument flags. */ @@ -105,7 +90,7 @@ static int mdoc_argvflags[MDOC_ARG_MAX] = { }; static int mdoc_argflags[MDOC_MAX] = { - 0, /* \" */ + 0, /* Ap */ 0, /* Dd */ 0, /* Dt */ 0, /* Os */ @@ -116,7 +101,7 @@ static int mdoc_argflags[MDOC_MAX] = { ARGS_DELIM | ARGS_QUOTED, /* Dl */ 0, /* Bd */ 0, /* Ed */ - 0, /* Bl */ + ARGS_QUOTED, /* Bl */ 0, /* El */ 0, /* It */ ARGS_DELIM, /* Ad */ @@ -212,7 +197,6 @@ static int mdoc_argflags[MDOC_MAX] = { 0, /* Fr */ 0, /* Ud */ 0, /* Lb */ - 0, /* Ap */ ARGS_DELIM, /* Lp */ ARGS_DELIM | ARGS_QUOTED, /* Lk */ ARGS_DELIM | ARGS_QUOTED, /* Mt */ @@ -224,6 +208,8 @@ static int mdoc_argflags[MDOC_MAX] = { 0, /* En */ 0, /* Dx */ ARGS_QUOTED, /* %Q */ + 0, /* br */ + 0, /* sp */ }; @@ -233,7 +219,7 @@ static int mdoc_argflags[MDOC_MAX] = { * one mandatory value, an optional single value, or no value. */ int -mdoc_argv(struct mdoc *mdoc, int line, int tok, +mdoc_argv(struct mdoc *m, int line, int tok, struct mdoc_arg **v, int *pos, char *buf) { int i; @@ -282,7 +268,7 @@ mdoc_argv(struct mdoc *mdoc, int line, int tok, /* XXX - restore saved zeroed byte. */ if (sv) buf[*pos - 1] = sv; - if ( ! pwarn(mdoc, line, i, WARGVPARM)) + if ( ! mdoc_pwarn(m, line, i, EARGVPARM)) return(ARGV_ERROR); return(ARGV_WORD); } @@ -290,19 +276,27 @@ mdoc_argv(struct mdoc *mdoc, int line, int tok, while (buf[*pos] && ' ' == buf[*pos]) (*pos)++; - if ( ! argv(mdoc, line, &tmp, pos, buf)) + if ( ! argv(m, line, &tmp, pos, buf)) return(ARGV_ERROR); if (NULL == (arg = *v)) { - if (NULL == (*v = calloc(1, sizeof(struct mdoc_arg)))) - err(1, "calloc"); + *v = calloc(1, sizeof(struct mdoc_arg)); + if (NULL == *v) { + (void)mdoc_nerr(m, m->last, EMALLOC); + return(ARGV_ERROR); + } arg = *v; } arg->argc++; - arg->argv = xrealloc(arg->argv, arg->argc * + arg->argv = realloc(arg->argv, arg->argc * sizeof(struct mdoc_argv)); + if (NULL == arg->argv) { + (void)mdoc_nerr(m, m->last, EMALLOC); + return(ARGV_ERROR); + } + (void)memcpy(&arg->argv[(int)arg->argc - 1], &tmp, sizeof(struct mdoc_argv)); @@ -323,7 +317,6 @@ mdoc_argv_free(struct mdoc_arg *p) if (p->refcnt) return; } - assert(p->argc); /* LINTED */ @@ -342,61 +335,8 @@ mdoc_argv_free(struct mdoc_arg *p) } - -static int -perr(struct mdoc *mdoc, int line, int pos, enum merr code) -{ - char *p; - - p = NULL; - - switch (code) { - case (EQUOTTERM): - p = "unterminated quoted parameter"; - break; - case (EARGVAL): - p = "argument requires a value"; - break; - } - - assert(p); - return(mdoc_perr(mdoc, line, pos, p)); -} - - -static int -pwarn(struct mdoc *mdoc, int line, int pos, enum mwarn code) -{ - char *p; - int c; - - p = NULL; - c = WARN_SYNTAX; - - switch (code) { - case (WQUOTPARM): - p = "unexpected quoted parameter"; - break; - case (WARGVPARM): - p = "argument-like parameter"; - break; - case (WCOLEMPTY): - p = "last list column is empty"; - c = WARN_COMPAT; - break; - case (WTAILWS): - p = "trailing whitespace"; - c = WARN_COMPAT; - break; - } - - assert(p); - return(mdoc_pwarn(mdoc, line, pos, c, p)); -} - - int -mdoc_args(struct mdoc *mdoc, int line, +mdoc_args(struct mdoc *m, int line, int *pos, char *buf, int tok, char **v) { int fl, c, i; @@ -412,7 +352,7 @@ mdoc_args(struct mdoc *mdoc, int line, switch (tok) { case (MDOC_It): - for (n = mdoc->last; n; n = n->parent) + for (n = m->last; n; n = n->parent) if (MDOC_BLOCK == n->type && MDOC_Bl == n->tok) break; @@ -447,13 +387,13 @@ mdoc_args(struct mdoc *mdoc, int line, break; } - return(args(mdoc, line, pos, buf, fl, v)); + return(args(m, line, pos, buf, fl, v)); } static int -args(struct mdoc *mdoc, int line, - int *pos, char *buf, int fl, char **v) +args(struct mdoc *m, int line, int *pos, + char *buf, int fl, char **v) { int i; char *p, *pp; @@ -464,11 +404,11 @@ args(struct mdoc *mdoc, int line, return(ARGS_EOLN); if ('\"' == buf[*pos] && ! (fl & ARGS_QUOTED)) - if ( ! pwarn(mdoc, line, *pos, WQUOTPARM)) + if ( ! mdoc_pwarn(m, line, *pos, EQUOTPARM)) return(ARGS_ERROR); if ( ! (fl & ARGS_ARGVLIKE) && '-' == buf[*pos]) - if ( ! pwarn(mdoc, line, *pos, WARGVPARM)) + if ( ! mdoc_pwarn(m, line, *pos, EARGVPARM)) return(ARGS_ERROR); /* @@ -560,11 +500,11 @@ args(struct mdoc *mdoc, int line, } if (p && 0 == *p) - if ( ! pwarn(mdoc, line, *pos, WCOLEMPTY)) - return(0); + if ( ! mdoc_pwarn(m, line, *pos, ECOLEMPTY)) + return(ARGS_ERROR); if (p && 0 == *p && p > *v && ' ' == *(p - 1)) - if ( ! pwarn(mdoc, line, *pos, WTAILWS)) - return(0); + if ( ! mdoc_pwarn(m, line, *pos, ETAILWS)) + return(ARGS_ERROR); if (p) return(ARGS_PHRASE); @@ -575,8 +515,8 @@ args(struct mdoc *mdoc, int line, assert(p); if (p > *v && ' ' == *(p - 1)) - if ( ! pwarn(mdoc, line, *pos, WTAILWS)) - return(0); + if ( ! mdoc_pwarn(m, line, *pos, ETAILWS)) + return(ARGS_ERROR); *pos += (int)(p - *v); return(ARGS_PHRASE); @@ -607,7 +547,7 @@ args(struct mdoc *mdoc, int line, if (buf[*pos]) return(ARGS_WORD); - if ( ! pwarn(mdoc, line, *pos, WTAILWS)) + if ( ! mdoc_pwarn(m, line, *pos, ETAILWS)) return(ARGS_ERROR); return(ARGS_WORD); @@ -625,7 +565,7 @@ args(struct mdoc *mdoc, int line, (*pos)++; if (0 == buf[*pos]) { - (void)perr(mdoc, line, *pos, EQUOTTERM); + (void)mdoc_perr(m, line, *pos, EQUOTTERM); return(ARGS_ERROR); } @@ -639,7 +579,7 @@ args(struct mdoc *mdoc, int line, if (buf[*pos]) return(ARGS_QWORD); - if ( ! pwarn(mdoc, line, *pos, WTAILWS)) + if ( ! mdoc_pwarn(m, line, *pos, ETAILWS)) return(ARGS_ERROR); return(ARGS_QWORD); @@ -660,80 +600,80 @@ argv_a2arg(int tok, const char *argv) switch (tok) { case (MDOC_An): - if (xstrcmp(argv, "split")) + if (0 == strcmp(argv, "split")) return(MDOC_Split); - else if (xstrcmp(argv, "nosplit")) + else if (0 == strcmp(argv, "nosplit")) return(MDOC_Nosplit); break; case (MDOC_Bd): - if (xstrcmp(argv, "ragged")) + if (0 == strcmp(argv, "ragged")) return(MDOC_Ragged); - else if (xstrcmp(argv, "unfilled")) + else if (0 == strcmp(argv, "unfilled")) return(MDOC_Unfilled); - else if (xstrcmp(argv, "filled")) + else if (0 == strcmp(argv, "filled")) return(MDOC_Filled); - else if (xstrcmp(argv, "literal")) + else if (0 == strcmp(argv, "literal")) return(MDOC_Literal); - else if (xstrcmp(argv, "file")) + else if (0 == strcmp(argv, "file")) return(MDOC_File); - else if (xstrcmp(argv, "offset")) + else if (0 == strcmp(argv, "offset")) return(MDOC_Offset); - else if (xstrcmp(argv, "compact")) + else if (0 == strcmp(argv, "compact")) return(MDOC_Compact); break; case (MDOC_Bf): - if (xstrcmp(argv, "emphasis")) + if (0 == strcmp(argv, "emphasis")) return(MDOC_Emphasis); - else if (xstrcmp(argv, "literal")) + else if (0 == strcmp(argv, "literal")) return(MDOC_Literal); - else if (xstrcmp(argv, "symbolic")) + else if (0 == strcmp(argv, "symbolic")) return(MDOC_Symbolic); break; case (MDOC_Bk): - if (xstrcmp(argv, "words")) + if (0 == strcmp(argv, "words")) return(MDOC_Words); break; case (MDOC_Bl): - if (xstrcmp(argv, "bullet")) + if (0 == strcmp(argv, "bullet")) return(MDOC_Bullet); - else if (xstrcmp(argv, "dash")) + else if (0 == strcmp(argv, "dash")) return(MDOC_Dash); - else if (xstrcmp(argv, "hyphen")) + else if (0 == strcmp(argv, "hyphen")) return(MDOC_Hyphen); - else if (xstrcmp(argv, "item")) + else if (0 == strcmp(argv, "item")) return(MDOC_Item); - else if (xstrcmp(argv, "enum")) + else if (0 == strcmp(argv, "enum")) return(MDOC_Enum); - else if (xstrcmp(argv, "tag")) + else if (0 == strcmp(argv, "tag")) return(MDOC_Tag); - else if (xstrcmp(argv, "diag")) + else if (0 == strcmp(argv, "diag")) return(MDOC_Diag); - else if (xstrcmp(argv, "hang")) + else if (0 == strcmp(argv, "hang")) return(MDOC_Hang); - else if (xstrcmp(argv, "ohang")) + else if (0 == strcmp(argv, "ohang")) return(MDOC_Ohang); - else if (xstrcmp(argv, "inset")) + else if (0 == strcmp(argv, "inset")) return(MDOC_Inset); - else if (xstrcmp(argv, "column")) + else if (0 == strcmp(argv, "column")) return(MDOC_Column); - else if (xstrcmp(argv, "width")) + else if (0 == strcmp(argv, "width")) return(MDOC_Width); - else if (xstrcmp(argv, "offset")) + else if (0 == strcmp(argv, "offset")) return(MDOC_Offset); - else if (xstrcmp(argv, "compact")) + else if (0 == strcmp(argv, "compact")) return(MDOC_Compact); - else if (xstrcmp(argv, "nested")) + else if (0 == strcmp(argv, "nested")) return(MDOC_Nested); break; case (MDOC_Rv): /* FALLTHROUGH */ case (MDOC_Ex): - if (xstrcmp(argv, "std")) + if (0 == strcmp(argv, "std")) return(MDOC_Std); break; default: @@ -745,39 +685,39 @@ argv_a2arg(int tok, const char *argv) static int -argv_multi(struct mdoc *mdoc, int line, +argv_multi(struct mdoc *m, int line, struct mdoc_argv *v, int *pos, char *buf) { - int c, ppos; + int c; char *p; - ppos = *pos; - for (v->sz = 0; ; v->sz++) { if ('-' == buf[*pos]) break; - c = args(mdoc, line, pos, buf, ARGS_QUOTED, &p); + c = args(m, line, pos, buf, ARGS_QUOTED, &p); if (ARGS_ERROR == c) return(0); else if (ARGS_EOLN == c) break; - if (0 == v->sz % MULTI_STEP) - v->value = xrealloc(v->value, + if (0 == v->sz % MULTI_STEP) { + v->value = realloc(v->value, (v->sz + MULTI_STEP) * sizeof(char *)); + if (NULL == v->value) { + (void)mdoc_nerr(m, m->last, EMALLOC); + return(ARGV_ERROR); + } + } if (NULL == (v->value[(int)v->sz] = strdup(p))) - err(1, "strdup"); + return(mdoc_nerr(m, m->last, EMALLOC)); } - if (v->sz) - return(1); - - return(perr(mdoc, line, ppos, EARGVAL)); + return(1); } static int -argv_opt_single(struct mdoc *mdoc, int line, +argv_opt_single(struct mdoc *m, int line, struct mdoc_argv *v, int *pos, char *buf) { int c; @@ -786,7 +726,7 @@ argv_opt_single(struct mdoc *mdoc, int line, if ('-' == buf[*pos]) return(1); - c = args(mdoc, line, pos, buf, ARGS_QUOTED, &p); + c = args(m, line, pos, buf, ARGS_QUOTED, &p); if (ARGS_ERROR == c) return(0); if (ARGS_EOLN == c) @@ -794,9 +734,10 @@ argv_opt_single(struct mdoc *mdoc, int line, v->sz = 1; if (NULL == (v->value = calloc(1, sizeof(char *)))) - err(1, "calloc"); + return(mdoc_nerr(m, m->last, EMALLOC)); if (NULL == (v->value[0] = strdup(p))) - err(1, "strdup"); + return(mdoc_nerr(m, m->last, EMALLOC)); + return(1); } @@ -805,7 +746,7 @@ argv_opt_single(struct mdoc *mdoc, int line, * Parse a single, mandatory value from the stream. */ static int -argv_single(struct mdoc *mdoc, int line, +argv_single(struct mdoc *m, int line, struct mdoc_argv *v, int *pos, char *buf) { int c, ppos; @@ -813,17 +754,18 @@ argv_single(struct mdoc *mdoc, int line, ppos = *pos; - c = args(mdoc, line, pos, buf, ARGS_QUOTED, &p); + c = args(m, line, pos, buf, ARGS_QUOTED, &p); if (ARGS_ERROR == c) return(0); if (ARGS_EOLN == c) - return(perr(mdoc, line, ppos, EARGVAL)); + return(mdoc_perr(m, line, ppos, EARGVAL)); v->sz = 1; if (NULL == (v->value = calloc(1, sizeof(char *)))) - err(1, "calloc"); + return(mdoc_nerr(m, m->last, EMALLOC)); if (NULL == (v->value[0] = strdup(p))) - err(1, "strdup"); + return(mdoc_nerr(m, m->last, EMALLOC)); + return(1); }