=================================================================== RCS file: /cvs/mandoc/mdoc_argv.c,v retrieving revision 1.26 retrieving revision 1.31 diff -u -p -r1.26 -r1.31 --- mandoc/mdoc_argv.c 2009/09/24 13:03:32 1.26 +++ mandoc/mdoc_argv.c 2009/10/28 19:21:59 1.31 @@ -1,4 +1,4 @@ -/* $Id: mdoc_argv.c,v 1.26 2009/09/24 13:03:32 kristaps Exp $ */ +/* $Id: mdoc_argv.c,v 1.31 2009/10/28 19:21:59 kristaps Exp $ */ /* * Copyright (c) 2008, 2009 Kristaps Dzonsons * @@ -23,6 +23,7 @@ #include #include "libmdoc.h" +#include "libmandoc.h" /* * Routines to parse arguments of macros. Arguments follow the syntax @@ -59,7 +60,7 @@ static int mdoc_argvflags[MDOC_ARG_MAX] = { ARGV_NONE, /* MDOC_Ragged */ ARGV_NONE, /* MDOC_Unfilled */ ARGV_NONE, /* MDOC_Literal */ - ARGV_NONE, /* MDOC_File */ + ARGV_SINGLE, /* MDOC_File */ ARGV_OPT_SINGLE, /* MDOC_Offset */ ARGV_NONE, /* MDOC_Bullet */ ARGV_NONE, /* MDOC_Dash */ @@ -203,6 +204,7 @@ static int mdoc_argflags[MDOC_MAX] = { 0, /* %Q */ 0, /* br */ 0, /* sp */ + 0, /* %U */ }; @@ -265,24 +267,13 @@ mdoc_argv(struct mdoc *m, int line, int tok, if ( ! argv(m, line, &tmp, pos, buf)) return(ARGV_ERROR); - if (NULL == (arg = *v)) { - *v = calloc(1, sizeof(struct mdoc_arg)); - if (NULL == *v) { - (void)mdoc_nerr(m, m->last, EMALLOC); - return(ARGV_ERROR); - } - arg = *v; - } + if (NULL == (arg = *v)) + arg = mandoc_calloc(1, sizeof(struct mdoc_arg)); arg->argc++; - arg->argv = realloc(arg->argv, arg->argc * - sizeof(struct mdoc_argv)); + arg->argv = mandoc_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)); @@ -557,7 +548,7 @@ args(struct mdoc *m, int line, int *pos, static int -argv_a2arg(int tok, const char *argv) +argv_a2arg(int tok, const char *p) { /* @@ -570,80 +561,82 @@ argv_a2arg(int tok, const char *argv) switch (tok) { case (MDOC_An): - if (0 == strcmp(argv, "split")) + if (0 == strcmp(p, "split")) return(MDOC_Split); - else if (0 == strcmp(argv, "nosplit")) + else if (0 == strcmp(p, "nosplit")) return(MDOC_Nosplit); break; case (MDOC_Bd): - if (0 == strcmp(argv, "ragged")) + if (0 == strcmp(p, "ragged")) return(MDOC_Ragged); - else if (0 == strcmp(argv, "unfilled")) + else if (0 == strcmp(p, "unfilled")) return(MDOC_Unfilled); - else if (0 == strcmp(argv, "filled")) + else if (0 == strcmp(p, "filled")) return(MDOC_Filled); - else if (0 == strcmp(argv, "literal")) + else if (0 == strcmp(p, "literal")) return(MDOC_Literal); - else if (0 == strcmp(argv, "file")) + else if (0 == strcmp(p, "file")) return(MDOC_File); - else if (0 == strcmp(argv, "offset")) + else if (0 == strcmp(p, "offset")) return(MDOC_Offset); - else if (0 == strcmp(argv, "compact")) + else if (0 == strcmp(p, "compact")) return(MDOC_Compact); + else if (0 == strcmp(p, "centered")) + return(MDOC_Centred); break; case (MDOC_Bf): - if (0 == strcmp(argv, "emphasis")) + if (0 == strcmp(p, "emphasis")) return(MDOC_Emphasis); - else if (0 == strcmp(argv, "literal")) + else if (0 == strcmp(p, "literal")) return(MDOC_Literal); - else if (0 == strcmp(argv, "symbolic")) + else if (0 == strcmp(p, "symbolic")) return(MDOC_Symbolic); break; case (MDOC_Bk): - if (0 == strcmp(argv, "words")) + if (0 == strcmp(p, "words")) return(MDOC_Words); break; case (MDOC_Bl): - if (0 == strcmp(argv, "bullet")) + if (0 == strcmp(p, "bullet")) return(MDOC_Bullet); - else if (0 == strcmp(argv, "dash")) + else if (0 == strcmp(p, "dash")) return(MDOC_Dash); - else if (0 == strcmp(argv, "hyphen")) + else if (0 == strcmp(p, "hyphen")) return(MDOC_Hyphen); - else if (0 == strcmp(argv, "item")) + else if (0 == strcmp(p, "item")) return(MDOC_Item); - else if (0 == strcmp(argv, "enum")) + else if (0 == strcmp(p, "enum")) return(MDOC_Enum); - else if (0 == strcmp(argv, "tag")) + else if (0 == strcmp(p, "tag")) return(MDOC_Tag); - else if (0 == strcmp(argv, "diag")) + else if (0 == strcmp(p, "diag")) return(MDOC_Diag); - else if (0 == strcmp(argv, "hang")) + else if (0 == strcmp(p, "hang")) return(MDOC_Hang); - else if (0 == strcmp(argv, "ohang")) + else if (0 == strcmp(p, "ohang")) return(MDOC_Ohang); - else if (0 == strcmp(argv, "inset")) + else if (0 == strcmp(p, "inset")) return(MDOC_Inset); - else if (0 == strcmp(argv, "column")) + else if (0 == strcmp(p, "column")) return(MDOC_Column); - else if (0 == strcmp(argv, "width")) + else if (0 == strcmp(p, "width")) return(MDOC_Width); - else if (0 == strcmp(argv, "offset")) + else if (0 == strcmp(p, "offset")) return(MDOC_Offset); - else if (0 == strcmp(argv, "compact")) + else if (0 == strcmp(p, "compact")) return(MDOC_Compact); - else if (0 == strcmp(argv, "nested")) + else if (0 == strcmp(p, "nested")) return(MDOC_Nested); break; case (MDOC_Rv): /* FALLTHROUGH */ case (MDOC_Ex): - if (0 == strcmp(argv, "std")) + if (0 == strcmp(p, "std")) return(MDOC_Std); break; default: @@ -670,16 +663,11 @@ argv_multi(struct mdoc *m, int line, else if (ARGS_EOLN == c) break; - if (0 == v->sz % MULTI_STEP) { - v->value = realloc(v->value, + if (0 == v->sz % MULTI_STEP) + v->value = mandoc_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))) - return(mdoc_nerr(m, m->last, EMALLOC)); + + v->value[(int)v->sz] = mandoc_strdup(p); } return(1); @@ -703,10 +691,8 @@ argv_opt_single(struct mdoc *m, int line, return(1); v->sz = 1; - if (NULL == (v->value = calloc(1, sizeof(char *)))) - return(mdoc_nerr(m, m->last, EMALLOC)); - if (NULL == (v->value[0] = strdup(p))) - return(mdoc_nerr(m, m->last, EMALLOC)); + v->value = mandoc_malloc(sizeof(char *)); + v->value[0] = mandoc_strdup(p); return(1); } @@ -731,10 +717,8 @@ argv_single(struct mdoc *m, int line, return(mdoc_perr(m, line, ppos, EARGVAL)); v->sz = 1; - if (NULL == (v->value = calloc(1, sizeof(char *)))) - return(mdoc_nerr(m, m->last, EMALLOC)); - if (NULL == (v->value[0] = strdup(p))) - return(mdoc_nerr(m, m->last, EMALLOC)); + v->value = mandoc_malloc(sizeof(char *)); + v->value[0] = mandoc_strdup(p); return(1); }