diff options
author | Kristaps Dzonsons <kristaps@bsd.lv> | 2011-04-17 09:13:01 +0000 |
---|---|---|
committer | Kristaps Dzonsons <kristaps@bsd.lv> | 2011-04-17 09:13:01 +0000 |
commit | a65ded6f88a5566586477092a6edb7f254de0347 (patch) | |
tree | 25ff0fc61253b989696a9d1bedd4afbd210efd8f | |
parent | 0880ade932d57aac1fa88eaaf4668570bff7cf1d (diff) | |
download | mandoc-a65ded6f88a5566586477092a6edb7f254de0347.tar.gz mandoc-a65ded6f88a5566586477092a6edb7f254de0347.tar.zst mandoc-a65ded6f88a5566586477092a6edb7f254de0347.zip |
Use mandoc_getarg() for the regular case of processing unquoted
arguments in -mdoc documents.
-rw-r--r-- | mdoc_argv.c | 24 |
1 files changed, 4 insertions, 20 deletions
diff --git a/mdoc_argv.c b/mdoc_argv.c index 7537a17f..ec651354 100644 --- a/mdoc_argv.c +++ b/mdoc_argv.c @@ -1,4 +1,4 @@ -/* $Id: mdoc_argv.c,v 1.74 2011/04/07 01:08:42 joerg Exp $ */ +/* $Id: mdoc_argv.c,v 1.75 2011/04/17 09:13:01 kristaps Exp $ */ /* * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv> * @@ -568,25 +568,9 @@ args(struct mdoc *m, int line, int *pos, return(ARGS_QWORD); } - /* - * A non-quoted term progresses until either the end of line or - * a non-escaped whitespace. - */ - - for ( ; buf[*pos]; (*pos)++) - if (*pos && ' ' == buf[*pos] && '\\' != buf[*pos - 1]) - break; - - if ('\0' == buf[*pos]) - return(ARGS_WORD); - - buf[(*pos)++] = '\0'; - - while (' ' == buf[*pos]) - (*pos)++; - - if ('\0' == buf[*pos] && ! (ARGS_NOWARN & fl)) - mdoc_pmsg(m, line, *pos, MANDOCERR_EOLNSPACE); + p = &buf[*pos]; + *v = mandoc_getarg(m->parse, &p, line, + ! (ARGS_NOWARN & fl), pos); return(ARGS_WORD); } |