version 1.28, 2009/10/15 01:33:12 |
version 1.49, 2010/05/17 22:11:42 |
|
|
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF |
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF |
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. |
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. |
*/ |
*/ |
|
#ifdef HAVE_CONFIG_H |
|
#include "config.h" |
|
#endif |
|
|
#include <sys/types.h> |
#include <sys/types.h> |
|
|
#include <assert.h> |
#include <assert.h> |
|
|
#include <stdio.h> |
#include <stdio.h> |
#include <string.h> |
#include <string.h> |
|
|
|
#include "mandoc.h" |
#include "libmdoc.h" |
#include "libmdoc.h" |
|
#include "libmandoc.h" |
|
|
/* |
/* |
* Routines to parse arguments of macros. Arguments follow the syntax |
* Routines to parse arguments of macros. Arguments follow the syntax |
|
|
|
|
#define MULTI_STEP 5 |
#define MULTI_STEP 5 |
|
|
static int argv_a2arg(int, const char *); |
static int argv_a2arg(enum mdoct, const char *); |
static int args(struct mdoc *, int, int *, |
static enum margserr args(struct mdoc *, int, int *, |
char *, int, char **); |
char *, int, char **); |
static int argv(struct mdoc *, int, |
static int argv(struct mdoc *, int, |
struct mdoc_argv *, int *, char *); |
struct mdoc_argv *, int *, char *); |
Line 59 static int mdoc_argvflags[MDOC_ARG_MAX] = { |
|
Line 65 static int mdoc_argvflags[MDOC_ARG_MAX] = { |
|
ARGV_NONE, /* MDOC_Ragged */ |
ARGV_NONE, /* MDOC_Ragged */ |
ARGV_NONE, /* MDOC_Unfilled */ |
ARGV_NONE, /* MDOC_Unfilled */ |
ARGV_NONE, /* MDOC_Literal */ |
ARGV_NONE, /* MDOC_Literal */ |
ARGV_NONE, /* MDOC_File */ |
ARGV_SINGLE, /* MDOC_File */ |
ARGV_OPT_SINGLE, /* MDOC_Offset */ |
ARGV_OPT_SINGLE, /* MDOC_Offset */ |
ARGV_NONE, /* MDOC_Bullet */ |
ARGV_NONE, /* MDOC_Bullet */ |
ARGV_NONE, /* MDOC_Dash */ |
ARGV_NONE, /* MDOC_Dash */ |
Line 203 static int mdoc_argflags[MDOC_MAX] = { |
|
Line 209 static int mdoc_argflags[MDOC_MAX] = { |
|
0, /* %Q */ |
0, /* %Q */ |
0, /* br */ |
0, /* br */ |
0, /* sp */ |
0, /* sp */ |
|
0, /* %U */ |
}; |
}; |
|
|
|
|
Line 211 static int mdoc_argflags[MDOC_MAX] = { |
|
Line 218 static int mdoc_argflags[MDOC_MAX] = { |
|
* [value0...], which may either have a single mandatory value, at least |
* [value0...], which may either have a single mandatory value, at least |
* one mandatory value, an optional single value, or no value. |
* one mandatory value, an optional single value, or no value. |
*/ |
*/ |
int |
enum margverr |
mdoc_argv(struct mdoc *m, int line, int tok, |
mdoc_argv(struct mdoc *m, int line, enum mdoct tok, |
struct mdoc_arg **v, int *pos, char *buf) |
struct mdoc_arg **v, int *pos, char *buf) |
{ |
{ |
char *p, sv; |
char *p, sv; |
Line 265 mdoc_argv(struct mdoc *m, int line, int tok, |
|
Line 272 mdoc_argv(struct mdoc *m, int line, int tok, |
|
if ( ! argv(m, line, &tmp, pos, buf)) |
if ( ! argv(m, line, &tmp, pos, buf)) |
return(ARGV_ERROR); |
return(ARGV_ERROR); |
|
|
if (NULL == (arg = *v)) { |
if (NULL == (arg = *v)) |
*v = calloc(1, sizeof(struct mdoc_arg)); |
arg = *v = mandoc_calloc(1, sizeof(struct mdoc_arg)); |
if (NULL == *v) { |
|
(void)mdoc_nerr(m, m->last, EMALLOC); |
|
return(ARGV_ERROR); |
|
} |
|
arg = *v; |
|
} |
|
|
|
arg->argc++; |
arg->argc++; |
arg->argv = realloc(arg->argv, arg->argc * |
arg->argv = mandoc_realloc |
sizeof(struct mdoc_argv)); |
(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], |
(void)memcpy(&arg->argv[(int)arg->argc - 1], |
&tmp, sizeof(struct mdoc_argv)); |
&tmp, sizeof(struct mdoc_argv)); |
|
|
Line 293 mdoc_argv(struct mdoc *m, int line, int tok, |
|
Line 289 mdoc_argv(struct mdoc *m, int line, int tok, |
|
void |
void |
mdoc_argv_free(struct mdoc_arg *p) |
mdoc_argv_free(struct mdoc_arg *p) |
{ |
{ |
int i, j; |
int i; |
|
|
if (NULL == p) |
if (NULL == p) |
return; |
return; |
Line 305 mdoc_argv_free(struct mdoc_arg *p) |
|
Line 301 mdoc_argv_free(struct mdoc_arg *p) |
|
} |
} |
assert(p->argc); |
assert(p->argc); |
|
|
/* LINTED */ |
for (i = (int)p->argc - 1; i >= 0; i--) |
for (i = 0; i < (int)p->argc; i++) { |
mdoc_argn_free(p, i); |
if (0 == p->argv[i].sz) |
|
continue; |
|
if (NULL == p->argv[i].value) |
|
continue; |
|
|
|
/* LINTED */ |
free(p->argv); |
for (j = 0; j < (int)p->argv[i].sz; j++) |
free(p); |
if (p->argv[i].value[j]) |
} |
free(p->argv[i].value[j]); |
|
|
|
free(p->argv[i].value); |
|
|
void |
|
mdoc_argn_free(struct mdoc_arg *p, int iarg) |
|
{ |
|
struct mdoc_argv *arg = &p->argv[iarg]; |
|
int j; |
|
|
|
if (arg->sz && arg->value) { |
|
for (j = (int)arg->sz - 1; j >= 0; j--) |
|
free(arg->value[j]); |
|
free(arg->value); |
} |
} |
|
|
free(p->argv); |
for (--p->argc; iarg < (int)p->argc; iarg++) |
free(p); |
p->argv[iarg] = p->argv[iarg+1]; |
} |
} |
|
|
|
|
int |
enum margserr |
mdoc_zargs(struct mdoc *m, int line, int *pos, |
mdoc_zargs(struct mdoc *m, int line, int *pos, |
char *buf, int flags, char **v) |
char *buf, int flags, char **v) |
{ |
{ |
Line 334 mdoc_zargs(struct mdoc *m, int line, int *pos, |
|
Line 335 mdoc_zargs(struct mdoc *m, int line, int *pos, |
|
} |
} |
|
|
|
|
int |
enum margserr |
mdoc_args(struct mdoc *m, int line, |
mdoc_args(struct mdoc *m, int line, int *pos, |
int *pos, char *buf, int tok, char **v) |
char *buf, enum mdoct tok, char **v) |
{ |
{ |
int fl, c, i; |
int fl, c, i; |
struct mdoc_node *n; |
struct mdoc_node *n; |
|
|
fl = (0 == tok) ? 0 : mdoc_argflags[tok]; |
fl = mdoc_argflags[tok]; |
|
|
if (MDOC_It != tok) |
if (MDOC_It != tok) |
return(args(m, line, pos, buf, fl, v)); |
return(args(m, line, pos, buf, fl, v)); |
Line 372 mdoc_args(struct mdoc *m, int line, |
|
Line 373 mdoc_args(struct mdoc *m, int line, |
|
} |
} |
|
|
|
|
static int |
static enum margserr |
args(struct mdoc *m, int line, int *pos, |
args(struct mdoc *m, int line, int *pos, |
char *buf, int fl, char **v) |
char *buf, int fl, char **v) |
{ |
{ |
int i; |
int i; |
char *p, *pp; |
char *p, *pp; |
|
enum margserr rc; |
|
|
/* |
/* |
* Parse out the terms (like `val' in `.Xx -arg val' or simply |
* Parse out the terms (like `val' in `.Xx -arg val' or simply |
Line 397 args(struct mdoc *m, int line, int *pos, |
|
Line 399 args(struct mdoc *m, int line, int *pos, |
|
assert(*pos); |
assert(*pos); |
assert(' ' != buf[*pos]); |
assert(' ' != buf[*pos]); |
|
|
if (0 == buf[*pos]) |
if ('\0' == buf[*pos]) { |
|
if (MDOC_PPHRASE & m->flags) |
|
return(ARGS_EOLN); |
|
/* |
|
* If we're not in a partial phrase and the flag for |
|
* being a phrase literal is still set, the punctuation |
|
* is unterminated. |
|
*/ |
|
if (MDOC_PHRASELIT & m->flags) |
|
if ( ! mdoc_pmsg(m, line, *pos, MANDOCERR_BADQUOTE)) |
|
return(ARGS_ERROR); |
|
|
|
m->flags &= ~MDOC_PHRASELIT; |
return(ARGS_EOLN); |
return(ARGS_EOLN); |
|
} |
|
|
/* |
/* |
* If the first character is a delimiter and we're to look for |
* If the first character is a closing delimiter and we're to |
* delimited strings, then pass down the buffer seeing if it |
* look for delimited strings, then pass down the buffer seeing |
* follows the pattern of [[::delim::][ ]+]+. |
* if it follows the pattern of [[::delim::][ ]+]+. Note that |
|
* we ONLY care about closing delimiters. |
*/ |
*/ |
|
|
if ((fl & ARGS_DELIM) && mdoc_iscdelim(buf[*pos])) { |
if ((fl & ARGS_DELIM) && DELIM_CLOSE == mdoc_iscdelim(buf[*pos])) { |
for (i = *pos; buf[i]; ) { |
for (i = *pos; buf[i]; ) { |
if ( ! mdoc_iscdelim(buf[i])) |
enum mdelim d = mdoc_iscdelim(buf[i]); |
|
if (DELIM_NONE == d || DELIM_OPEN == d) |
break; |
break; |
i++; |
i++; |
if (0 == buf[i] || ' ' != buf[i]) |
if ('\0' == buf[i] || ' ' != buf[i]) |
break; |
break; |
i++; |
i++; |
while (buf[i] && ' ' == buf[i]) |
while (buf[i] && ' ' == buf[i]) |
i++; |
i++; |
} |
} |
|
|
if (0 == buf[i]) { |
if ('\0' == buf[i]) { |
*v = &buf[*pos]; |
*v = &buf[*pos]; |
if (' ' != buf[i - 1]) |
if (' ' != buf[i - 1]) |
return(ARGS_PUNCT); |
return(ARGS_PUNCT); |
if (ARGS_NOWARN & fl) |
if (ARGS_NOWARN & fl) |
return(ARGS_PUNCT); |
return(ARGS_PUNCT); |
if ( ! mdoc_pwarn(m, line, *pos, ETAILWS)) |
if ( ! mdoc_pmsg(m, line, *pos, MANDOCERR_EOLNSPACE)) |
return(ARGS_ERROR); |
return(ARGS_ERROR); |
return(ARGS_PUNCT); |
return(ARGS_PUNCT); |
} |
} |
Line 442 args(struct mdoc *m, int line, int *pos, |
|
Line 459 args(struct mdoc *m, int line, int *pos, |
|
if (ARGS_TABSEP & fl) { |
if (ARGS_TABSEP & fl) { |
/* Scan ahead to tab (can't be escaped). */ |
/* Scan ahead to tab (can't be escaped). */ |
p = strchr(*v, '\t'); |
p = strchr(*v, '\t'); |
|
pp = NULL; |
|
|
/* Scan ahead to unescaped `Ta'. */ |
/* Scan ahead to unescaped `Ta'. */ |
for (pp = *v; ; pp++) { |
if ( ! (MDOC_PHRASELIT & m->flags)) |
if (NULL == (pp = strstr(pp, "Ta"))) |
for (pp = *v; ; pp++) { |
break; |
if (NULL == (pp = strstr(pp, "Ta"))) |
if (pp > *v && ' ' != *(pp - 1)) |
break; |
continue; |
if (pp > *v && ' ' != *(pp - 1)) |
if (' ' == *(pp + 2) || 0 == *(pp + 2)) |
continue; |
break; |
if (' ' == *(pp + 2) || 0 == *(pp + 2)) |
} |
break; |
|
} |
|
|
|
/* By default, assume a phrase. */ |
|
rc = ARGS_PHRASE; |
|
|
/* |
/* |
* Adjust new-buffer position to be beyond delimiter |
* Adjust new-buffer position to be beyond delimiter |
* mark (e.g., Ta -> end + 2). |
* mark (e.g., Ta -> end + 2). |
*/ |
*/ |
if (p && pp) { |
if (p && pp) { |
*pos += pp < p ? 2 : 1; |
*pos += pp < p ? 2 : 1; |
|
rc = pp < p ? ARGS_PHRASE : ARGS_PPHRASE; |
p = pp < p ? pp : p; |
p = pp < p ? pp : p; |
} else if (p && ! pp) { |
} else if (p && ! pp) { |
|
rc = ARGS_PPHRASE; |
*pos += 1; |
*pos += 1; |
} else if (pp && ! p) { |
} else if (pp && ! p) { |
p = pp; |
p = pp; |
*pos += 2; |
*pos += 2; |
} else |
} else { |
|
rc = ARGS_PEND; |
p = strchr(*v, 0); |
p = strchr(*v, 0); |
|
} |
|
|
/* Whitespace check for eoln case... */ |
/* Whitespace check for eoln case... */ |
if (0 == *p && ' ' == *(p - 1) && ! (ARGS_NOWARN & fl)) |
if (0 == *p && ' ' == *(p - 1) && ! (ARGS_NOWARN & fl)) |
if ( ! mdoc_pwarn(m, line, *pos, ETAILWS)) |
if ( ! mdoc_pmsg(m, line, *pos, MANDOCERR_EOLNSPACE)) |
return(ARGS_ERROR); |
return(ARGS_ERROR); |
|
|
*pos += (int)(p - *v); |
*pos += (int)(p - *v); |
Line 488 args(struct mdoc *m, int line, int *pos, |
|
Line 514 args(struct mdoc *m, int line, int *pos, |
|
for (pp = &buf[*pos]; ' ' == *pp; pp++, (*pos)++) |
for (pp = &buf[*pos]; ' ' == *pp; pp++, (*pos)++) |
/* Skip ahead. */ ; |
/* Skip ahead. */ ; |
|
|
return(ARGS_PHRASE); |
return(rc); |
} |
} |
|
|
/* |
/* |
Line 497 args(struct mdoc *m, int line, int *pos, |
|
Line 523 args(struct mdoc *m, int line, int *pos, |
|
* Whitespace is NOT involved in literal termination. |
* Whitespace is NOT involved in literal termination. |
*/ |
*/ |
|
|
if ('\"' == buf[*pos]) { |
if (MDOC_PHRASELIT & m->flags || '\"' == buf[*pos]) { |
*v = &buf[++(*pos)]; |
if ( ! (MDOC_PHRASELIT & m->flags)) |
|
*v = &buf[++(*pos)]; |
|
|
|
if (MDOC_PPHRASE & m->flags) |
|
m->flags |= MDOC_PHRASELIT; |
|
|
for ( ; buf[*pos]; (*pos)++) { |
for ( ; buf[*pos]; (*pos)++) { |
if ('\"' != buf[*pos]) |
if ('\"' != buf[*pos]) |
continue; |
continue; |
Line 508 args(struct mdoc *m, int line, int *pos, |
|
Line 538 args(struct mdoc *m, int line, int *pos, |
|
(*pos)++; |
(*pos)++; |
} |
} |
|
|
if (0 == buf[*pos]) { |
if ('\0' == buf[*pos]) { |
if (ARGS_NOWARN & fl) |
if (ARGS_NOWARN & fl || MDOC_PPHRASE & m->flags) |
return(ARGS_QWORD); |
return(ARGS_QWORD); |
if ( ! mdoc_pwarn(m, line, *pos, EQUOTTERM)) |
if ( ! mdoc_pmsg(m, line, *pos, MANDOCERR_BADQUOTE)) |
return(ARGS_ERROR); |
return(ARGS_ERROR); |
return(ARGS_QWORD); |
return(ARGS_QWORD); |
} |
} |
|
|
buf[(*pos)++] = 0; |
m->flags &= ~MDOC_PHRASELIT; |
|
buf[(*pos)++] = '\0'; |
|
|
if (0 == buf[*pos]) |
if ('\0' == buf[*pos]) |
return(ARGS_QWORD); |
return(ARGS_QWORD); |
|
|
while (' ' == buf[*pos]) |
while (' ' == buf[*pos]) |
(*pos)++; |
(*pos)++; |
|
|
if (0 == buf[*pos] && ! (ARGS_NOWARN & fl)) |
if (0 == buf[*pos] && ! (ARGS_NOWARN & fl)) |
if ( ! mdoc_pwarn(m, line, *pos, ETAILWS)) |
if ( ! mdoc_pmsg(m, line, *pos, MANDOCERR_EOLNSPACE)) |
return(ARGS_ERROR); |
return(ARGS_ERROR); |
|
|
return(ARGS_QWORD); |
return(ARGS_QWORD); |
Line 540 args(struct mdoc *m, int line, int *pos, |
|
Line 571 args(struct mdoc *m, int line, int *pos, |
|
if (' ' == buf[*pos] && '\\' != buf[*pos - 1]) |
if (' ' == buf[*pos] && '\\' != buf[*pos - 1]) |
break; |
break; |
|
|
if (0 == buf[*pos]) |
if ('\0' == buf[*pos]) |
return(ARGS_WORD); |
return(ARGS_WORD); |
|
|
buf[(*pos)++] = 0; |
buf[(*pos)++] = '\0'; |
|
|
while (' ' == buf[*pos]) |
while (' ' == buf[*pos]) |
(*pos)++; |
(*pos)++; |
|
|
if (0 == buf[*pos] && ! (ARGS_NOWARN & fl)) |
if ('\0' == buf[*pos] && ! (ARGS_NOWARN & fl)) |
if ( ! mdoc_pwarn(m, line, *pos, ETAILWS)) |
if ( ! mdoc_pmsg(m, line, *pos, MANDOCERR_EOLNSPACE)) |
return(ARGS_ERROR); |
return(ARGS_ERROR); |
|
|
return(ARGS_WORD); |
return(ARGS_WORD); |
Line 557 args(struct mdoc *m, int line, int *pos, |
|
Line 588 args(struct mdoc *m, int line, int *pos, |
|
|
|
|
|
static int |
static int |
argv_a2arg(int tok, const char *p) |
argv_a2arg(enum mdoct tok, const char *p) |
{ |
{ |
|
|
/* |
/* |
|
|
argv_multi(struct mdoc *m, int line, |
argv_multi(struct mdoc *m, int line, |
struct mdoc_argv *v, int *pos, char *buf) |
struct mdoc_argv *v, int *pos, char *buf) |
{ |
{ |
int c; |
enum margserr ac; |
char *p; |
char *p; |
|
|
for (v->sz = 0; ; v->sz++) { |
for (v->sz = 0; ; v->sz++) { |
if ('-' == buf[*pos]) |
if ('-' == buf[*pos]) |
break; |
break; |
c = args(m, line, pos, buf, 0, &p); |
ac = args(m, line, pos, buf, 0, &p); |
if (ARGS_ERROR == c) |
if (ARGS_ERROR == ac) |
return(0); |
return(0); |
else if (ARGS_EOLN == c) |
else if (ARGS_EOLN == ac) |
break; |
break; |
|
|
if (0 == v->sz % MULTI_STEP) { |
if (0 == v->sz % MULTI_STEP) |
v->value = realloc(v->value, |
v->value = mandoc_realloc(v->value, |
(v->sz + MULTI_STEP) * sizeof(char *)); |
(v->sz + MULTI_STEP) * sizeof(char *)); |
if (NULL == v->value) { |
|
(void)mdoc_nerr(m, m->last, EMALLOC); |
v->value[(int)v->sz] = mandoc_strdup(p); |
return(ARGV_ERROR); |
|
} |
|
} |
|
if (NULL == (v->value[(int)v->sz] = strdup(p))) |
|
return(mdoc_nerr(m, m->last, EMALLOC)); |
|
} |
} |
|
|
return(1); |
return(1); |
|
|
argv_opt_single(struct mdoc *m, int line, |
argv_opt_single(struct mdoc *m, int line, |
struct mdoc_argv *v, int *pos, char *buf) |
struct mdoc_argv *v, int *pos, char *buf) |
{ |
{ |
int c; |
enum margserr ac; |
char *p; |
char *p; |
|
|
if ('-' == buf[*pos]) |
if ('-' == buf[*pos]) |
return(1); |
return(1); |
|
|
c = args(m, line, pos, buf, 0, &p); |
ac = args(m, line, pos, buf, 0, &p); |
if (ARGS_ERROR == c) |
if (ARGS_ERROR == ac) |
return(0); |
return(0); |
if (ARGS_EOLN == c) |
if (ARGS_EOLN == ac) |
return(1); |
return(1); |
|
|
v->sz = 1; |
v->sz = 1; |
if (NULL == (v->value = calloc(1, sizeof(char *)))) |
v->value = mandoc_malloc(sizeof(char *)); |
return(mdoc_nerr(m, m->last, EMALLOC)); |
v->value[0] = mandoc_strdup(p); |
if (NULL == (v->value[0] = strdup(p))) |
|
return(mdoc_nerr(m, m->last, EMALLOC)); |
|
|
|
return(1); |
return(1); |
} |
} |
|
|
argv_single(struct mdoc *m, int line, |
argv_single(struct mdoc *m, int line, |
struct mdoc_argv *v, int *pos, char *buf) |
struct mdoc_argv *v, int *pos, char *buf) |
{ |
{ |
int c, ppos; |
int ppos; |
|
enum margserr ac; |
char *p; |
char *p; |
|
|
ppos = *pos; |
ppos = *pos; |
|
|
c = args(m, line, pos, buf, 0, &p); |
ac = args(m, line, pos, buf, 0, &p); |
if (ARGS_ERROR == c) |
if (ARGS_EOLN == ac) { |
|
mdoc_pmsg(m, line, ppos, MANDOCERR_SYNTARGVCOUNT); |
return(0); |
return(0); |
if (ARGS_EOLN == c) |
} else if (ARGS_ERROR == ac) |
return(mdoc_perr(m, line, ppos, EARGVAL)); |
return(0); |
|
|
v->sz = 1; |
v->sz = 1; |
if (NULL == (v->value = calloc(1, sizeof(char *)))) |
v->value = mandoc_malloc(sizeof(char *)); |
return(mdoc_nerr(m, m->last, EMALLOC)); |
v->value[0] = mandoc_strdup(p); |
if (NULL == (v->value[0] = strdup(p))) |
|
return(mdoc_nerr(m, m->last, EMALLOC)); |
|
|
|
return(1); |
return(1); |
} |
} |