diff options
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | libman.h | 7 | ||||
| -rw-r--r-- | man_argv.c | 42 | ||||
| -rw-r--r-- | man_macro.c | 23 |
4 files changed, 20 insertions, 54 deletions
@@ -57,7 +57,6 @@ SRCS = Makefile \ main.h \ man.7 \ man.c \ - man_argv.c \ man_hash.c \ man_html.c \ man_macro.c \ @@ -104,7 +103,6 @@ SRCS = Makefile \ vol.in LIBMAN_OBJS = man.o \ - man_argv.o \ man_hash.o \ man_macro.o \ man_validate.o @@ -56,12 +56,6 @@ struct man_macro { #define MAN_NOCLOSE (1 << 4) /* See blk_exp(). */ }; -enum margserr { - ARGS_EOLN, - ARGS_WORD, - ARGS_QWORD -}; - extern const struct man_macro *const man_macros; __BEGIN_DECLS @@ -80,7 +74,6 @@ void man_node_delete(struct man *, struct man_node *); void man_hash_init(void); enum mant man_hash_find(const char *); int man_macroend(struct man *); -enum margserr man_args(struct man *, int, int *, char *, char **); int man_valid_post(struct man *); int man_valid_pre(struct man *, struct man_node *); int man_unscope(struct man *, diff --git a/man_argv.c b/man_argv.c deleted file mode 100644 index 6e69be8a..00000000 --- a/man_argv.c +++ /dev/null @@ -1,42 +0,0 @@ -/* $Id$ */ -/* - * Copyright (c) 2011 Ingo Schwarze <schwarze@openbsd.org> - * - * Permission to use, copy, modify, and distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include <assert.h> - -#include "man.h" -#include "mandoc.h" -#include "libman.h" -#include "libmandoc.h" - -enum margserr -man_args(struct man *m, int line, int *pos, char *buf, char **v) -{ - char *start; - - assert(*pos); - *v = start = buf + *pos; - assert(' ' != *start); - - if ('\0' == *start) - return(ARGS_EOLN); - - *v = mandoc_getarg(m->parse, v, line, pos); - return('"' == *start ? ARGS_QWORD : ARGS_WORD); -} diff --git a/man_macro.c b/man_macro.c index e0549822..aff3fb00 100644 --- a/man_macro.c +++ b/man_macro.c @@ -38,6 +38,8 @@ static int blk_close(MACRO_PROT_ARGS); static int blk_exp(MACRO_PROT_ARGS); static int blk_imp(MACRO_PROT_ARGS); static int in_line_eoln(MACRO_PROT_ARGS); +static int man_args(struct man *, int, + int *, char *, char **); static int rew_scope(enum man_type, struct man *, enum mant); @@ -317,7 +319,7 @@ blk_exp(MACRO_PROT_ARGS) for (;;) { la = *pos; - if (ARGS_EOLN == man_args(m, line, pos, buf, &p)) + if ( ! man_args(m, line, pos, buf, &p)) break; if ( ! man_word_alloc(m, line, la, p)) return(0); @@ -367,7 +369,7 @@ blk_imp(MACRO_PROT_ARGS) for (;;) { la = *pos; - if (ARGS_EOLN == man_args(m, line, pos, buf, &p)) + if ( ! man_args(m, line, pos, buf, &p)) break; if ( ! man_word_alloc(m, line, la, p)) return(0); @@ -407,7 +409,7 @@ in_line_eoln(MACRO_PROT_ARGS) for (;;) { la = *pos; - if (ARGS_EOLN == man_args(m, line, pos, buf, &p)) + if ( ! man_args(m, line, pos, buf, &p)) break; if ( ! man_word_alloc(m, line, la, p)) return(0); @@ -470,3 +472,18 @@ man_macroend(struct man *m) return(man_unscope(m, m->first, MANDOCERR_SCOPEEXIT)); } +static int +man_args(struct man *m, int line, int *pos, char *buf, char **v) +{ + char *start; + + assert(*pos); + *v = start = buf + *pos; + assert(' ' != *start); + + if ('\0' == *start) + return(0); + + *v = mandoc_getarg(m->parse, v, line, pos); + return(1); +} |