version 1.90, 2014/03/23 11:25:26 |
version 1.99, 2014/11/29 03:37:44 |
|
|
/* $Id$ */ |
/* $OpenBSD$ */ |
/* |
/* |
* Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2012 Ingo Schwarze <schwarze@openbsd.org> |
* Copyright (c) 2012, 2014 Ingo Schwarze <schwarze@openbsd.org> |
* |
* |
* Permission to use, copy, modify, and distribute this software for any |
* Permission to use, copy, modify, and distribute this software for any |
* purpose with or without fee is hereby granted, provided that the above |
* purpose with or without fee is hereby granted, provided that the above |
|
|
* 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" |
#include "config.h" |
#endif |
|
|
|
#include <sys/types.h> |
#include <sys/types.h> |
|
|
|
|
#include "libmandoc.h" |
#include "libmandoc.h" |
|
|
#define MULTI_STEP 5 /* pre-allocate argument values */ |
#define MULTI_STEP 5 /* pre-allocate argument values */ |
#define DELIMSZ 6 /* max possible size of a delimiter */ |
#define DELIMSZ 6 /* max possible size of a delimiter */ |
|
|
enum argsflag { |
enum argsflag { |
ARGSFL_NONE = 0, |
ARGSFL_NONE = 0, |
|
|
}; |
}; |
|
|
static void argn_free(struct mdoc_arg *, int); |
static void argn_free(struct mdoc_arg *, int); |
static enum margserr args(struct mdoc *, int, int *, |
static enum margserr args(struct mdoc *, int, int *, |
char *, enum argsflag, char **); |
char *, enum argsflag, char **); |
static int args_checkpunct(const char *, int); |
static int args_checkpunct(const char *, int); |
static int argv_multi(struct mdoc *, int, |
static void argv_multi(struct mdoc *, int, |
struct mdoc_argv *, int *, char *); |
struct mdoc_argv *, int *, char *); |
static int argv_single(struct mdoc *, int, |
static void argv_single(struct mdoc *, int, |
struct mdoc_argv *, int *, char *); |
struct mdoc_argv *, int *, char *); |
|
|
static const enum argvflag argvflags[MDOC_ARG_MAX] = { |
static const enum argvflag argvflags[MDOC_ARG_MAX] = { |
Line 150 static const struct mdocarg mdocargs[MDOC_MAX] = { |
|
Line 148 static const struct mdocarg mdocargs[MDOC_MAX] = { |
|
{ ARGSFL_NONE, NULL }, /* Dt */ |
{ ARGSFL_NONE, NULL }, /* Dt */ |
{ ARGSFL_NONE, NULL }, /* Os */ |
{ ARGSFL_NONE, NULL }, /* Os */ |
{ ARGSFL_NONE, NULL }, /* Sh */ |
{ ARGSFL_NONE, NULL }, /* Sh */ |
{ ARGSFL_NONE, NULL }, /* Ss */ |
{ ARGSFL_NONE, NULL }, /* Ss */ |
{ ARGSFL_NONE, NULL }, /* Pp */ |
{ ARGSFL_NONE, NULL }, /* Pp */ |
{ ARGSFL_DELIM, NULL }, /* D1 */ |
{ ARGSFL_DELIM, NULL }, /* D1 */ |
{ ARGSFL_DELIM, NULL }, /* Dl */ |
{ ARGSFL_DELIM, NULL }, /* Dl */ |
{ ARGSFL_NONE, args_Bd }, /* Bd */ |
{ ARGSFL_NONE, args_Bd }, /* Bd */ |
Line 159 static const struct mdocarg mdocargs[MDOC_MAX] = { |
|
Line 157 static const struct mdocarg mdocargs[MDOC_MAX] = { |
|
{ ARGSFL_NONE, args_Bl }, /* Bl */ |
{ ARGSFL_NONE, args_Bl }, /* Bl */ |
{ ARGSFL_NONE, NULL }, /* El */ |
{ ARGSFL_NONE, NULL }, /* El */ |
{ ARGSFL_NONE, NULL }, /* It */ |
{ ARGSFL_NONE, NULL }, /* It */ |
{ ARGSFL_DELIM, NULL }, /* Ad */ |
{ ARGSFL_DELIM, NULL }, /* Ad */ |
{ ARGSFL_DELIM, args_An }, /* An */ |
{ ARGSFL_DELIM, args_An }, /* An */ |
{ ARGSFL_DELIM, NULL }, /* Ar */ |
{ ARGSFL_DELIM, NULL }, /* Ar */ |
{ ARGSFL_DELIM, NULL }, /* Cd */ |
{ ARGSFL_DELIM, NULL }, /* Cd */ |
{ ARGSFL_DELIM, NULL }, /* Cm */ |
{ ARGSFL_DELIM, NULL }, /* Cm */ |
{ ARGSFL_DELIM, NULL }, /* Dv */ |
{ ARGSFL_DELIM, NULL }, /* Dv */ |
{ ARGSFL_DELIM, NULL }, /* Er */ |
{ ARGSFL_DELIM, NULL }, /* Er */ |
{ ARGSFL_DELIM, NULL }, /* Ev */ |
{ ARGSFL_DELIM, NULL }, /* Ev */ |
{ ARGSFL_NONE, args_Ex }, /* Ex */ |
{ ARGSFL_NONE, args_Ex }, /* Ex */ |
{ ARGSFL_DELIM, NULL }, /* Fa */ |
{ ARGSFL_DELIM, NULL }, /* Fa */ |
{ ARGSFL_NONE, NULL }, /* Fd */ |
{ ARGSFL_NONE, NULL }, /* Fd */ |
{ ARGSFL_DELIM, NULL }, /* Fl */ |
{ ARGSFL_DELIM, NULL }, /* Fl */ |
{ ARGSFL_DELIM, NULL }, /* Fn */ |
{ ARGSFL_DELIM, NULL }, /* Fn */ |
{ ARGSFL_DELIM, NULL }, /* Ft */ |
{ ARGSFL_DELIM, NULL }, /* Ft */ |
{ ARGSFL_DELIM, NULL }, /* Ic */ |
{ ARGSFL_DELIM, NULL }, /* Ic */ |
{ ARGSFL_DELIM, NULL }, /* In */ |
{ ARGSFL_DELIM, NULL }, /* In */ |
{ ARGSFL_DELIM, NULL }, /* Li */ |
{ ARGSFL_DELIM, NULL }, /* Li */ |
{ ARGSFL_NONE, NULL }, /* Nd */ |
{ ARGSFL_NONE, NULL }, /* Nd */ |
{ ARGSFL_DELIM, NULL }, /* Nm */ |
{ ARGSFL_DELIM, NULL }, /* Nm */ |
{ ARGSFL_DELIM, NULL }, /* Op */ |
{ ARGSFL_DELIM, NULL }, /* Op */ |
{ ARGSFL_NONE, NULL }, /* Ot */ |
{ ARGSFL_DELIM, NULL }, /* Ot */ |
{ ARGSFL_DELIM, NULL }, /* Pa */ |
{ ARGSFL_DELIM, NULL }, /* Pa */ |
{ ARGSFL_NONE, args_Ex }, /* Rv */ |
{ ARGSFL_NONE, args_Ex }, /* Rv */ |
{ ARGSFL_DELIM, NULL }, /* St */ |
{ ARGSFL_DELIM, NULL }, /* St */ |
{ ARGSFL_DELIM, NULL }, /* Va */ |
{ ARGSFL_DELIM, NULL }, /* Va */ |
{ ARGSFL_DELIM, NULL }, /* Vt */ |
{ ARGSFL_DELIM, NULL }, /* Vt */ |
{ ARGSFL_DELIM, NULL }, /* Xr */ |
{ ARGSFL_DELIM, NULL }, /* Xr */ |
{ ARGSFL_NONE, NULL }, /* %A */ |
{ ARGSFL_NONE, NULL }, /* %A */ |
{ ARGSFL_NONE, NULL }, /* %B */ |
{ ARGSFL_NONE, NULL }, /* %B */ |
Line 202 static const struct mdocarg mdocargs[MDOC_MAX] = { |
|
Line 200 static const struct mdocarg mdocargs[MDOC_MAX] = { |
|
{ ARGSFL_DELIM, NULL }, /* Aq */ |
{ ARGSFL_DELIM, NULL }, /* Aq */ |
{ ARGSFL_DELIM, NULL }, /* At */ |
{ ARGSFL_DELIM, NULL }, /* At */ |
{ ARGSFL_DELIM, NULL }, /* Bc */ |
{ ARGSFL_DELIM, NULL }, /* Bc */ |
{ ARGSFL_NONE, args_Bf }, /* Bf */ |
{ ARGSFL_NONE, args_Bf }, /* Bf */ |
{ ARGSFL_NONE, NULL }, /* Bo */ |
{ ARGSFL_NONE, NULL }, /* Bo */ |
{ ARGSFL_DELIM, NULL }, /* Bq */ |
{ ARGSFL_DELIM, NULL }, /* Bq */ |
{ ARGSFL_DELIM, NULL }, /* Bsx */ |
{ ARGSFL_DELIM, NULL }, /* Bsx */ |
Line 213 static const struct mdocarg mdocargs[MDOC_MAX] = { |
|
Line 211 static const struct mdocarg mdocargs[MDOC_MAX] = { |
|
{ ARGSFL_DELIM, NULL }, /* Dq */ |
{ ARGSFL_DELIM, NULL }, /* Dq */ |
{ ARGSFL_DELIM, NULL }, /* Ec */ |
{ ARGSFL_DELIM, NULL }, /* Ec */ |
{ ARGSFL_NONE, NULL }, /* Ef */ |
{ ARGSFL_NONE, NULL }, /* Ef */ |
{ ARGSFL_DELIM, NULL }, /* Em */ |
{ ARGSFL_DELIM, NULL }, /* Em */ |
{ ARGSFL_NONE, NULL }, /* Eo */ |
{ ARGSFL_NONE, NULL }, /* Eo */ |
{ ARGSFL_DELIM, NULL }, /* Fx */ |
{ ARGSFL_DELIM, NULL }, /* Fx */ |
{ ARGSFL_DELIM, NULL }, /* Ms */ |
{ ARGSFL_DELIM, NULL }, /* Ms */ |
Line 241 static const struct mdocarg mdocargs[MDOC_MAX] = { |
|
Line 239 static const struct mdocarg mdocargs[MDOC_MAX] = { |
|
{ ARGSFL_DELIM, NULL }, /* Ux */ |
{ ARGSFL_DELIM, NULL }, /* Ux */ |
{ ARGSFL_DELIM, NULL }, /* Xc */ |
{ ARGSFL_DELIM, NULL }, /* Xc */ |
{ ARGSFL_NONE, NULL }, /* Xo */ |
{ ARGSFL_NONE, NULL }, /* Xo */ |
{ ARGSFL_NONE, NULL }, /* Fo */ |
{ ARGSFL_NONE, NULL }, /* Fo */ |
{ ARGSFL_DELIM, NULL }, /* Fc */ |
{ ARGSFL_DELIM, NULL }, /* Fc */ |
{ ARGSFL_NONE, NULL }, /* Oo */ |
{ ARGSFL_NONE, NULL }, /* Oo */ |
{ ARGSFL_DELIM, NULL }, /* Oc */ |
{ ARGSFL_DELIM, NULL }, /* Oc */ |
{ ARGSFL_NONE, args_Bk }, /* Bk */ |
{ ARGSFL_NONE, args_Bk }, /* Bk */ |
{ ARGSFL_NONE, NULL }, /* Ek */ |
{ ARGSFL_NONE, NULL }, /* Ek */ |
{ ARGSFL_NONE, NULL }, /* Bt */ |
{ ARGSFL_NONE, NULL }, /* Bt */ |
{ ARGSFL_NONE, NULL }, /* Hf */ |
{ ARGSFL_NONE, NULL }, /* Hf */ |
{ ARGSFL_NONE, NULL }, /* Fr */ |
{ ARGSFL_DELIM, NULL }, /* Fr */ |
{ ARGSFL_NONE, NULL }, /* Ud */ |
{ ARGSFL_NONE, NULL }, /* Ud */ |
{ ARGSFL_DELIM, NULL }, /* Lb */ |
{ ARGSFL_DELIM, NULL }, /* Lb */ |
{ ARGSFL_NONE, NULL }, /* Lp */ |
{ ARGSFL_NONE, NULL }, /* Lp */ |
Line 260 static const struct mdocarg mdocargs[MDOC_MAX] = { |
|
Line 258 static const struct mdocarg mdocargs[MDOC_MAX] = { |
|
{ ARGSFL_DELIM, NULL }, /* Brc */ |
{ ARGSFL_DELIM, NULL }, /* Brc */ |
{ ARGSFL_NONE, NULL }, /* %C */ |
{ ARGSFL_NONE, NULL }, /* %C */ |
{ ARGSFL_NONE, NULL }, /* Es */ |
{ ARGSFL_NONE, NULL }, /* Es */ |
{ ARGSFL_NONE, NULL }, /* En */ |
{ ARGSFL_DELIM, NULL }, /* En */ |
{ ARGSFL_DELIM, NULL }, /* Dx */ |
{ ARGSFL_DELIM, NULL }, /* Dx */ |
{ ARGSFL_NONE, NULL }, /* %Q */ |
{ ARGSFL_NONE, NULL }, /* %Q */ |
{ ARGSFL_NONE, NULL }, /* br */ |
{ ARGSFL_NONE, NULL }, /* br */ |
{ ARGSFL_NONE, NULL }, /* sp */ |
{ ARGSFL_NONE, NULL }, /* sp */ |
{ ARGSFL_NONE, NULL }, /* %U */ |
{ ARGSFL_NONE, NULL }, /* %U */ |
{ ARGSFL_NONE, NULL }, /* Ta */ |
{ ARGSFL_NONE, NULL }, /* Ta */ |
|
{ ARGSFL_NONE, NULL }, /* ll */ |
}; |
}; |
|
|
|
|
/* |
/* |
* Parse an argument from line text. This comes in the form of -key |
* Parse flags and their arguments from the input line. |
* [value0...], which may either have a single mandatory value, at least |
* These come in the form -flag [argument ...]. |
* one mandatory value, an optional single value, or no value. |
* Some flags take no argument, some one, some multiple. |
*/ |
*/ |
enum margverr |
void |
mdoc_argv(struct mdoc *mdoc, int line, enum mdoct tok, |
mdoc_argv(struct mdoc *mdoc, int line, enum mdoct tok, |
struct mdoc_arg **v, int *pos, char *buf) |
struct mdoc_arg **reta, int *pos, char *buf) |
{ |
{ |
char *p, sv; |
struct mdoc_argv tmpv; |
struct mdoc_argv tmp; |
struct mdoc_argv **retv; |
struct mdoc_arg *arg; |
const enum mdocargt *argtable; |
const enum mdocargt *ap; |
char *argname; |
|
int ipos, retc; |
|
char savechar; |
|
|
if ('\0' == buf[*pos]) |
*reta = NULL; |
return(ARGV_EOLN); |
|
else if (NULL == (ap = mdocargs[tok].argvs)) |
|
return(ARGV_WORD); |
|
else if ('-' != buf[*pos]) |
|
return(ARGV_WORD); |
|
|
|
/* Seek to the first unescaped space. */ |
/* Which flags does this macro support? */ |
|
|
p = &buf[++(*pos)]; |
argtable = mdocargs[tok].argvs; |
|
if (argtable == NULL) |
|
return; |
|
|
assert(*pos > 0); |
/* Loop over the flags on the input line. */ |
|
|
for ( ; buf[*pos] ; (*pos)++) |
ipos = *pos; |
if (' ' == buf[*pos] && '\\' != buf[*pos - 1]) |
while (buf[ipos] == '-') { |
break; |
|
|
|
/* |
/* Seek to the first unescaped space. */ |
* We want to nil-terminate the word to look it up (it's easier |
|
* that way). But we may not have a flag, in which case we need |
|
* to restore the line as-is. So keep around the stray byte, |
|
* which we'll reset upon exiting (if necessary). |
|
*/ |
|
|
|
if ('\0' != (sv = buf[*pos])) |
for (argname = buf + ++ipos; buf[ipos] != '\0'; ipos++) |
buf[(*pos)++] = '\0'; |
if (buf[ipos] == ' ' && buf[ipos - 1] != '\\') |
|
break; |
|
|
/* |
/* |
* Now look up the word as a flag. Use temporary storage that |
* We want to nil-terminate the word to look it up. |
* we'll copy into the node's flags, if necessary. |
* But we may not have a flag, in which case we need |
*/ |
* to restore the line as-is. So keep around the |
|
* stray byte, which we'll reset upon exiting. |
|
*/ |
|
|
memset(&tmp, 0, sizeof(struct mdoc_argv)); |
if ((savechar = buf[ipos]) != '\0') |
|
buf[ipos++] = '\0'; |
|
|
tmp.line = line; |
/* |
tmp.pos = *pos; |
* Now look up the word as a flag. Use temporary |
tmp.arg = MDOC_ARG_MAX; |
* storage that we'll copy into the node's flags. |
|
*/ |
|
|
while (MDOC_ARG_MAX != (tmp.arg = *ap++)) |
while ((tmpv.arg = *argtable++) != MDOC_ARG_MAX) |
if (0 == strcmp(p, mdoc_argnames[tmp.arg])) |
if ( ! strcmp(argname, mdoc_argnames[tmpv.arg])) |
|
break; |
|
|
|
/* If it isn't a flag, restore the saved byte. */ |
|
|
|
if (tmpv.arg == MDOC_ARG_MAX) { |
|
if (savechar != '\0') |
|
buf[ipos - 1] = savechar; |
break; |
break; |
|
} |
|
|
if (MDOC_ARG_MAX == tmp.arg) { |
/* Read to the next word (the first argument). */ |
/* |
|
* The flag was not found. |
|
* Restore saved zeroed byte and return as a word. |
|
*/ |
|
if (sv) |
|
buf[*pos - 1] = sv; |
|
return(ARGV_WORD); |
|
} |
|
|
|
/* Read to the next word (the argument). */ |
while (buf[ipos] == ' ') |
|
ipos++; |
|
|
while (buf[*pos] && ' ' == buf[*pos]) |
/* Parse the arguments of the flag. */ |
(*pos)++; |
|
|
|
switch (argvflags[tmp.arg]) { |
tmpv.line = line; |
case (ARGV_SINGLE): |
tmpv.pos = ipos; |
if ( ! argv_single(mdoc, line, &tmp, pos, buf)) |
tmpv.sz = 0; |
return(ARGV_ERROR); |
tmpv.value = NULL; |
break; |
|
case (ARGV_MULTI): |
|
if ( ! argv_multi(mdoc, line, &tmp, pos, buf)) |
|
return(ARGV_ERROR); |
|
break; |
|
case (ARGV_NONE): |
|
break; |
|
} |
|
|
|
if (NULL == (arg = *v)) |
switch (argvflags[tmpv.arg]) { |
arg = *v = mandoc_calloc(1, sizeof(struct mdoc_arg)); |
case ARGV_SINGLE: |
|
argv_single(mdoc, line, &tmpv, &ipos, buf); |
|
break; |
|
case ARGV_MULTI: |
|
argv_multi(mdoc, line, &tmpv, &ipos, buf); |
|
break; |
|
case ARGV_NONE: |
|
break; |
|
} |
|
|
arg->argc++; |
/* Append to the return values. */ |
arg->argv = mandoc_realloc |
|
(arg->argv, arg->argc * sizeof(struct mdoc_argv)); |
|
|
|
memcpy(&arg->argv[(int)arg->argc - 1], |
if (*reta == NULL) |
&tmp, sizeof(struct mdoc_argv)); |
*reta = mandoc_calloc(1, sizeof(**reta)); |
|
|
return(ARGV_ARG); |
retc = ++(*reta)->argc; |
|
retv = &(*reta)->argv; |
|
*retv = mandoc_reallocarray(*retv, retc, sizeof(**retv)); |
|
memcpy(*retv + retc - 1, &tmpv, sizeof(**retv)); |
|
|
|
/* Prepare for parsing the next flag. */ |
|
|
|
*pos = ipos; |
|
argtable = mdocargs[tok].argvs; |
|
} |
} |
} |
|
|
void |
void |
Line 398 argn_free(struct mdoc_arg *p, int iarg) |
|
Line 402 argn_free(struct mdoc_arg *p, int iarg) |
|
arg = &p->argv[iarg]; |
arg = &p->argv[iarg]; |
|
|
if (arg->sz && arg->value) { |
if (arg->sz && arg->value) { |
for (j = (int)arg->sz - 1; j >= 0; j--) |
for (j = (int)arg->sz - 1; j >= 0; j--) |
free(arg->value[j]); |
free(arg->value[j]); |
free(arg->value); |
free(arg->value); |
} |
} |
Line 408 argn_free(struct mdoc_arg *p, int iarg) |
|
Line 412 argn_free(struct mdoc_arg *p, int iarg) |
|
} |
} |
|
|
enum margserr |
enum margserr |
mdoc_zargs(struct mdoc *mdoc, int line, int *pos, char *buf, char **v) |
mdoc_args(struct mdoc *mdoc, int line, int *pos, |
{ |
|
|
|
return(args(mdoc, line, pos, buf, ARGSFL_NONE, v)); |
|
} |
|
|
|
enum margserr |
|
mdoc_args(struct mdoc *mdoc, int line, int *pos, |
|
char *buf, enum mdoct tok, char **v) |
char *buf, enum mdoct tok, char **v) |
{ |
{ |
enum argsflag fl; |
|
struct mdoc_node *n; |
struct mdoc_node *n; |
|
char *v_local; |
|
enum argsflag fl; |
|
|
fl = mdocargs[tok].flags; |
if (v == NULL) |
|
v = &v_local; |
if (MDOC_It != tok) |
fl = tok == MDOC_MAX ? ARGSFL_NONE : mdocargs[tok].flags; |
|
if (tok != MDOC_It) |
return(args(mdoc, line, pos, buf, fl, v)); |
return(args(mdoc, line, pos, buf, fl, v)); |
|
|
/* |
/* |
Line 444 mdoc_args(struct mdoc *mdoc, int line, int *pos, |
|
Line 443 mdoc_args(struct mdoc *mdoc, int line, int *pos, |
|
} |
} |
|
|
static enum margserr |
static enum margserr |
args(struct mdoc *mdoc, int line, int *pos, |
args(struct mdoc *mdoc, int line, int *pos, |
char *buf, enum argsflag fl, char **v) |
char *buf, enum argsflag fl, char **v) |
{ |
{ |
char *p, *pp; |
char *p, *pp; |
Line 460 args(struct mdoc *mdoc, int line, int *pos, |
|
Line 459 args(struct mdoc *mdoc, int line, int *pos, |
|
* is unterminated. |
* is unterminated. |
*/ |
*/ |
if (MDOC_PHRASELIT & mdoc->flags) |
if (MDOC_PHRASELIT & mdoc->flags) |
mdoc_pmsg(mdoc, line, *pos, MANDOCERR_BADQUOTE); |
mandoc_msg(MANDOCERR_ARG_QUOTE, |
|
mdoc->parse, line, *pos, NULL); |
|
|
mdoc->flags &= ~MDOC_PHRASELIT; |
mdoc->flags &= ~MDOC_PHRASELIT; |
return(ARGS_EOLN); |
return(ARGS_EOLN); |
Line 485 args(struct mdoc *mdoc, int line, int *pos, |
|
Line 485 args(struct mdoc *mdoc, int line, int *pos, |
|
pp = NULL; |
pp = NULL; |
|
|
/* Scan ahead to unescaped `Ta'. */ |
/* Scan ahead to unescaped `Ta'. */ |
if ( ! (MDOC_PHRASELIT & mdoc->flags)) |
if ( ! (MDOC_PHRASELIT & mdoc->flags)) |
for (pp = *v; ; pp++) { |
for (pp = *v; ; pp++) { |
if (NULL == (pp = strstr(pp, "Ta"))) |
if (NULL == (pp = strstr(pp, "Ta"))) |
break; |
break; |
Line 498 args(struct mdoc *mdoc, int line, int *pos, |
|
Line 498 args(struct mdoc *mdoc, int line, int *pos, |
|
/* By default, assume a phrase. */ |
/* By default, assume a phrase. */ |
rc = ARGS_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). |
*/ |
*/ |
Line 519 args(struct mdoc *mdoc, int line, int *pos, |
|
Line 519 args(struct mdoc *mdoc, int line, int *pos, |
|
|
|
/* Whitespace check for eoln case... */ |
/* Whitespace check for eoln case... */ |
if ('\0' == *p && ' ' == *(p - 1)) |
if ('\0' == *p && ' ' == *(p - 1)) |
mdoc_pmsg(mdoc, line, *pos, MANDOCERR_EOLNSPACE); |
mandoc_msg(MANDOCERR_SPACE_EOL, mdoc->parse, |
|
line, *pos, NULL); |
|
|
*pos += (int)(p - *v); |
*pos += (int)(p - *v); |
|
|
Line 574 args(struct mdoc *mdoc, int line, int *pos, |
|
Line 575 args(struct mdoc *mdoc, int line, int *pos, |
|
if ('\0' == buf[*pos]) { |
if ('\0' == buf[*pos]) { |
if (MDOC_PPHRASE & mdoc->flags) |
if (MDOC_PPHRASE & mdoc->flags) |
return(ARGS_QWORD); |
return(ARGS_QWORD); |
mdoc_pmsg(mdoc, line, *pos, MANDOCERR_BADQUOTE); |
mandoc_msg(MANDOCERR_ARG_QUOTE, |
|
mdoc->parse, line, *pos, NULL); |
return(ARGS_QWORD); |
return(ARGS_QWORD); |
} |
} |
|
|
Line 588 args(struct mdoc *mdoc, int line, int *pos, |
|
Line 590 args(struct mdoc *mdoc, int line, int *pos, |
|
(*pos)++; |
(*pos)++; |
|
|
if ('\0' == buf[*pos]) |
if ('\0' == buf[*pos]) |
mdoc_pmsg(mdoc, line, *pos, MANDOCERR_EOLNSPACE); |
mandoc_msg(MANDOCERR_SPACE_EOL, mdoc->parse, |
|
line, *pos, NULL); |
|
|
return(ARGS_QWORD); |
return(ARGS_QWORD); |
} |
} |
Line 599 args(struct mdoc *mdoc, int line, int *pos, |
|
Line 602 args(struct mdoc *mdoc, int line, int *pos, |
|
return(ARGS_WORD); |
return(ARGS_WORD); |
} |
} |
|
|
/* |
/* |
* Check if the string consists only of space-separated closing |
* Check if the string consists only of space-separated closing |
* delimiters. This is a bit of a dance: the first must be a close |
* delimiters. This is a bit of a dance: the first must be a close |
* delimiter, but it may be followed by middle delimiters. Arbitrary |
* delimiter, but it may be followed by middle delimiters. Arbitrary |
Line 628 args_checkpunct(const char *buf, int i) |
|
Line 631 args_checkpunct(const char *buf, int i) |
|
i++; |
i++; |
|
|
/* Remaining must NOT be open/none. */ |
/* Remaining must NOT be open/none. */ |
|
|
while (buf[i]) { |
while (buf[i]) { |
j = 0; |
j = 0; |
while (buf[i] && ' ' != buf[i] && j < DELIMSZ) |
while (buf[i] && ' ' != buf[i] && j < DELIMSZ) |
Line 649 args_checkpunct(const char *buf, int i) |
|
Line 652 args_checkpunct(const char *buf, int i) |
|
return('\0' == buf[i]); |
return('\0' == buf[i]); |
} |
} |
|
|
static int |
static void |
argv_multi(struct mdoc *mdoc, int line, |
argv_multi(struct mdoc *mdoc, int line, |
struct mdoc_argv *v, int *pos, char *buf) |
struct mdoc_argv *v, int *pos, char *buf) |
{ |
{ |
enum margserr ac; |
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; |
ac = args(mdoc, line, pos, buf, ARGSFL_NONE, &p); |
ac = args(mdoc, line, pos, buf, ARGSFL_NONE, &p); |
if (ARGS_ERROR == ac) |
if (ac == ARGS_EOLN) |
return(0); |
|
else if (ARGS_EOLN == ac) |
|
break; |
break; |
|
|
if (0 == v->sz % MULTI_STEP) |
if (v->sz % MULTI_STEP == 0) |
v->value = mandoc_realloc(v->value, |
v->value = mandoc_reallocarray(v->value, |
(v->sz + MULTI_STEP) * sizeof(char *)); |
v->sz + MULTI_STEP, sizeof(char *)); |
|
|
v->value[(int)v->sz] = mandoc_strdup(p); |
v->value[(int)v->sz] = mandoc_strdup(p); |
} |
} |
|
|
return(1); |
|
} |
} |
|
|
static int |
static void |
argv_single(struct mdoc *mdoc, int line, |
argv_single(struct mdoc *mdoc, int line, |
struct mdoc_argv *v, int *pos, char *buf) |
struct mdoc_argv *v, int *pos, char *buf) |
{ |
{ |
enum margserr ac; |
enum margserr ac; |
char *p; |
char *p; |
|
|
ac = args(mdoc, line, pos, buf, ARGSFL_NONE, &p); |
ac = args(mdoc, line, pos, buf, ARGSFL_NONE, &p); |
if (ARGS_ERROR == ac) |
if (ac == ARGS_EOLN) |
return(0); |
return; |
if (ARGS_EOLN == ac) |
|
return(1); |
|
|
|
v->sz = 1; |
v->sz = 1; |
v->value = mandoc_malloc(sizeof(char *)); |
v->value = mandoc_malloc(sizeof(char *)); |
v->value[0] = mandoc_strdup(p); |
v->value[0] = mandoc_strdup(p); |
|
|
return(1); |
|
} |
} |