From 69728b7655db4690f0b1575dc285c718b3980d25 Mon Sep 17 00:00:00 2001 From: Kristaps Dzonsons Date: Thu, 26 May 2011 11:58:25 +0000 Subject: If a predefined string is missing, emit a warning and make it an empty string instead of passing it along to libmdoc/libman (where it'll be printed verbatim, now). This is what groff seems to do, too (of course without a warning). --- roff.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/roff.c b/roff.c index a9dbce22..92a4a9b3 100644 --- a/roff.c +++ b/roff.c @@ -1,4 +1,4 @@ -/* $Id: roff.c,v 1.141 2011/05/24 21:18:06 kristaps Exp $ */ +/* $Id: roff.c,v 1.142 2011/05/26 11:58:25 kristaps Exp $ */ /* * Copyright (c) 2010, 2011 Kristaps Dzonsons * Copyright (c) 2010, 2011 Ingo Schwarze @@ -150,7 +150,7 @@ static const char *roff_getstrn(const struct roff *, static enum rofferr roff_line_ignore(ROFF_ARGS); static enum rofferr roff_nr(ROFF_ARGS); static int roff_res(struct roff *, - char **, size_t *, int); + char **, size_t *, int, int); static enum rofferr roff_rm(ROFF_ARGS); static void roff_setstr(struct roff *, const char *, const char *, int); @@ -387,7 +387,7 @@ roff_alloc(struct regset *regs, struct mparse *parse) * is processed. */ static int -roff_res(struct roff *r, char **bufp, size_t *szp, int pos) +roff_res(struct roff *r, char **bufp, size_t *szp, int ln, int pos) { const char *stesc; /* start of an escape sequence ('\\') */ const char *stnam; /* start of the name, after "[(*" */ @@ -454,8 +454,9 @@ roff_res(struct roff *r, char **bufp, size_t *szp, int pos) res = roff_getstrn(r, stnam, (size_t)i); if (NULL == res) { - cp -= maxl ? 1 : 0; - continue; + /* TODO: keep track of the correct position. */ + mandoc_msg(MANDOCERR_BADESCAPE, r->parse, ln, pos, NULL); + res = ""; } /* Replace the escape sequence by the string. */ @@ -491,7 +492,7 @@ roff_parseln(struct roff *r, int ln, char **bufp, * words to fill in. */ - if (r->first_string && ! roff_res(r, bufp, szp, pos)) + if (r->first_string && ! roff_res(r, bufp, szp, ln, pos)) return(ROFF_REPARSE); ppos = pos; -- cgit v1.2.3-56-ge451