version 1.40, 2009/03/08 12:40:27 |
version 1.48, 2009/03/11 00:39:58 |
|
|
* 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 */ |
|
ARGS_DELIM, /* Brq */ |
|
0, /* Bro */ |
|
ARGS_DELIM, /* Brc */ |
}; |
}; |
|
|
|
|
Line 220 mdoc_argv(struct mdoc *mdoc, int line, int tok, |
|
Line 229 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 254 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 277 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 293 mdoc_argv_free(struct mdoc_arg *p) |
|
Line 314 mdoc_argv_free(struct mdoc_arg *p) |
|
{ |
{ |
int i, j; |
int i, j; |
|
|
|
if (NULL == p) |
|
return; |
|
|
if (p->refcnt) { |
if (p->refcnt) { |
--(p->refcnt); |
--(p->refcnt); |
if (p->refcnt) |
if (p->refcnt) |
Line 566 args(struct mdoc *mdoc, int line, |
|
Line 590 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)) |