diff options
| author |   Kristaps Dzonsons <kristaps@bsd.lv> | 2010-12-01 10:31:34 +0000 |
|---|---|---|
| committer | Kristaps Dzonsons <kristaps@bsd.lv> | 2010-12-01 10:31:34 +0000 |
| commit | 1c61a1b1241d9362e411865da7ea7cd895d7cc2f (patch) | |
| tree | 6039fbb56a25bc186135a48149692a6a15812fb7 /roff.c | |
| parent | f3cefbf118751bbcb538866931598b97d1cd8a89 (diff) | |
| download | mandoc-1c61a1b1241d9362e411865da7ea7cd895d7cc2f.tar.gz mandoc-1c61a1b1241d9362e411865da7ea7cd895d7cc2f.tar.zst mandoc-1c61a1b1241d9362e411865da7ea7cd895d7cc2f.zip | |
Re-ordering of roff requests as per OpenBSD.
Made `rm' be an error (again, OpenBSD...).
Diffstat (limited to 'roff.c')
| -rw-r--r-- | roff.c | 18 |
1 files changed, 13 insertions, 5 deletions
@@ -1,4 +1,4 @@ -/* $Id: roff.c,v 1.103 2010/12/01 10:21:25 kristaps Exp $ */ +/* $Id: roff.c,v 1.104 2010/12/01 10:31:35 kristaps Exp $ */ /* * Copyright (c) 2010 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2010 Ingo Schwarze <schwarze@openbsd.org> @@ -60,11 +60,11 @@ enum rofft { ROFF_ig, ROFF_ne, ROFF_nh, + ROFF_nr, ROFF_rm, ROFF_tr, ROFF_cblock, ROFF_ccond, /* FIXME: remove this. */ - ROFF_nr, ROFF_MAX }; @@ -135,6 +135,7 @@ static void roff_freestr(struct roff *); static const char *roff_getstrn(const struct roff *, const char *, size_t); static enum rofferr roff_line_ignore(ROFF_ARGS); +static enum rofferr roff_line_error(ROFF_ARGS); static enum rofferr roff_nr(ROFF_ARGS); static int roff_res(struct roff *, char **, size_t *, int); @@ -166,11 +167,11 @@ static struct roffmac roffs[ROFF_MAX] = { { "ig", roff_block, roff_block_text, roff_block_sub, 0, NULL }, { "ne", roff_line_ignore, NULL, NULL, 0, NULL }, { "nh", roff_line_ignore, NULL, NULL, 0, NULL }, - { "rm", roff_line_ignore, NULL, NULL, 0, NULL }, + { "nr", roff_nr, NULL, NULL, 0, NULL }, + { "rm", roff_line_error, NULL, NULL, 0, NULL }, { "tr", roff_line_ignore, NULL, NULL, 0, NULL }, { ".", roff_cblock, NULL, NULL, 0, NULL }, { "\\}", roff_ccond, NULL, NULL, 0, NULL }, - { "nr", roff_nr, NULL, NULL, 0, NULL }, }; static void roff_free1(struct roff *); @@ -846,7 +847,6 @@ roff_evalcond(const char *v, int *pos) return(ROFFRULE_DENY); } - /* ARGSUSED */ static enum rofferr roff_line_ignore(ROFF_ARGS) @@ -855,6 +855,14 @@ roff_line_ignore(ROFF_ARGS) return(ROFF_IGN); } +/* ARGSUSED */ +static enum rofferr +roff_line_error(ROFF_ARGS) +{ + + (*r->msg)(MANDOCERR_REQUEST, r->data, ln, ppos, roffs[tok].name); + return(ROFF_IGN); +} /* ARGSUSED */ static enum rofferr |