version 1.39, 2009/03/08 11:41:22 |
version 1.47, 2009/03/10 21:27:39 |
|
|
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR |
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR |
* PERFORMANCE OF THIS SOFTWARE. |
* PERFORMANCE OF THIS SOFTWARE. |
*/ |
*/ |
|
#include <sys/types.h> |
|
|
#include <assert.h> |
#include <assert.h> |
#include <ctype.h> |
#include <ctype.h> |
#include <err.h> |
#include <err.h> |
Line 207 static int mdoc_argflags[MDOC_MAX] = { |
|
Line 209 static int mdoc_argflags[MDOC_MAX] = { |
|
0, /* Fr */ |
0, /* Fr */ |
0, /* Ud */ |
0, /* Ud */ |
0, /* Lb */ |
0, /* Lb */ |
|
0, /* Ap */ |
|
ARGS_DELIM, /* Lp */ |
|
ARGS_DELIM | ARGS_QUOTED, /* Lk */ |
|
ARGS_DELIM | ARGS_QUOTED, /* Mt */ |
}; |
}; |
|
|
|
|
Line 220 mdoc_argv(struct mdoc *mdoc, int line, int tok, |
|
Line 226 mdoc_argv(struct mdoc *mdoc, int line, int tok, |
|
struct mdoc_arg **v, int *pos, char *buf) |
struct mdoc_arg **v, int *pos, char *buf) |
{ |
{ |
int i; |
int i; |
char *p; |
char *p, sv; |
struct mdoc_argv tmp; |
struct mdoc_argv tmp; |
struct mdoc_arg *arg; |
struct mdoc_arg *arg; |
|
|
Line 245 mdoc_argv(struct mdoc *mdoc, int line, int tok, |
|
Line 251 mdoc_argv(struct mdoc *mdoc, int line, int tok, |
|
(*pos)++; |
(*pos)++; |
} |
} |
|
|
if (buf[*pos]) |
/* |
|
* XXX: save the nullified byte as we'll restore it if this |
|
* doesn't end up being a command after all. This is a little |
|
* bit hacky. I don't like it, but it works for now. |
|
*/ |
|
|
|
sv = 0; |
|
if (buf[*pos]) { |
|
sv = buf[*pos]; |
buf[(*pos)++] = 0; |
buf[(*pos)++] = 0; |
|
} |
|
|
(void)memset(&tmp, 0, sizeof(struct mdoc_argv)); |
(void)memset(&tmp, 0, sizeof(struct mdoc_argv)); |
tmp.line = line; |
tmp.line = line; |
Line 259 mdoc_argv(struct mdoc *mdoc, int line, int tok, |
|
Line 274 mdoc_argv(struct mdoc *mdoc, int line, int tok, |
|
*/ |
*/ |
|
|
if (MDOC_ARG_MAX == (tmp.arg = argv_a2arg(tok, p))) { |
if (MDOC_ARG_MAX == (tmp.arg = argv_a2arg(tok, p))) { |
|
/* XXX - restore saved byte. */ |
|
if (sv) |
|
buf[*pos - 1] = sv; |
if ( ! pwarn(mdoc, line, i, WARGVPARM)) |
if ( ! pwarn(mdoc, line, i, WARGVPARM)) |
return(ARGV_ERROR); |
return(ARGV_ERROR); |
return(ARGV_WORD); |
return(ARGV_WORD); |
Line 273 mdoc_argv(struct mdoc *mdoc, int line, int tok, |
|
Line 291 mdoc_argv(struct mdoc *mdoc, int line, int tok, |
|
return(ARGV_ERROR); |
return(ARGV_ERROR); |
|
|
if (NULL == (arg = *v)) { |
if (NULL == (arg = *v)) { |
v = xcalloc(1, sizeof(struct mdoc_arg)); |
*v = xcalloc(1, sizeof(struct mdoc_arg)); |
arg = *v; |
arg = *v; |
} |
} |
|
|
arg->argc++; |
arg->argc++; |
arg->argv = xrealloc(arg->argv, arg->argc * |
arg->argv = xrealloc(arg->argv, arg->argc * |
sizeof(struct mdoc_arg)); |
sizeof(struct mdoc_argv)); |
|
|
(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_free(struct mdoc_arg *p) |
|
Line 311 mdoc_argv_free(struct mdoc_arg *p) |
|
{ |
{ |
int i, j; |
int i, j; |
|
|
if (p->refcnt && --(p->refcnt) > 0) |
if (NULL == p) |
return; |
return; |
|
|
|
if (p->refcnt) { |
|
--(p->refcnt); |
|
if (p->refcnt) |
|
return; |
|
} |
|
|
|
assert(p->argc); |
|
|
/* LINTED */ |
/* LINTED */ |
for (i = 0; i < (int)p->argc; i++) { |
for (i = 0; i < (int)p->argc; i++) { |
if (0 == p->argv[i].sz) |
if (0 == p->argv[i].sz) |
Line 303 mdoc_argv_free(struct mdoc_arg *p) |
|
Line 329 mdoc_argv_free(struct mdoc_arg *p) |
|
/* LINTED */ |
/* LINTED */ |
for (j = 0; j < (int)p->argv[i].sz; j++) |
for (j = 0; j < (int)p->argv[i].sz; j++) |
free(p->argv[i].value[j]); |
free(p->argv[i].value[j]); |
|
|
free(p->argv[i].value); |
free(p->argv[i].value); |
} |
} |
|
|
if (p->argc) |
free(p->argv); |
free(p->argv); |
|
free(p); |
free(p); |
} |
} |
|
|
Line 561 args(struct mdoc *mdoc, int line, |
|
Line 587 args(struct mdoc *mdoc, int line, |
|
|
|
return(ARGS_WORD); |
return(ARGS_WORD); |
} |
} |
|
|
/* Do non-tabsep look-ahead here. */ |
/* Do non-tabsep look-ahead here. */ |
|
|
if ( ! (ARGS_TABSEP & fl)) |
if ( ! (ARGS_TABSEP & fl)) |
Line 742 argv_multi(struct mdoc *mdoc, int line, |
|
Line 768 argv_multi(struct mdoc *mdoc, int line, |
|
v->value = xrealloc(v->value, |
v->value = xrealloc(v->value, |
(v->sz + 5) * sizeof(char *)); |
(v->sz + 5) * sizeof(char *)); |
|
|
v->value[(int)v->sz] = p; |
v->value[(int)v->sz] = xstrdup(p); |
} |
} |
|
|
if (v->sz) |
if (v->sz) |
Line 770 argv_opt_single(struct mdoc *mdoc, int line, |
|
Line 796 argv_opt_single(struct mdoc *mdoc, int line, |
|
|
|
v->sz = 1; |
v->sz = 1; |
v->value = xcalloc(1, sizeof(char *)); |
v->value = xcalloc(1, sizeof(char *)); |
v->value[0] = p; |
v->value[0] = xstrdup(p); |
return(1); |
return(1); |
} |
} |
|
|
Line 795 argv_single(struct mdoc *mdoc, int line, |
|
Line 821 argv_single(struct mdoc *mdoc, int line, |
|
|
|
v->sz = 1; |
v->sz = 1; |
v->value = xcalloc(1, sizeof(char *)); |
v->value = xcalloc(1, sizeof(char *)); |
v->value[0] = p; |
v->value[0] = xstrdup(p); |
return(1); |
return(1); |
} |
} |
|
|