diff options
author | Ingo Schwarze <schwarze@openbsd.org> | 2020-10-24 22:57:39 +0000 |
---|---|---|
committer | Ingo Schwarze <schwarze@openbsd.org> | 2020-10-24 22:57:39 +0000 |
commit | dc7248813739f10e087a87325e7aca75a5630c16 (patch) | |
tree | fdeddd350e8bd619fb51020263551f3e79b32964 /mandoc.c | |
parent | 7f36e58ef077e2bf3ff4592144b6be7ccc0db8de (diff) | |
download | mandoc-dc7248813739f10e087a87325e7aca75a5630c16.tar.gz mandoc-dc7248813739f10e087a87325e7aca75a5630c16.tar.zst mandoc-dc7248813739f10e087a87325e7aca75a5630c16.zip |
Treat \*[.T] in the same way as \*(.T rather than calling abort(3).
Bug found because the groff-current manual pages started using the
variant form of this predefined string.
Diffstat (limited to 'mandoc.c')
-rw-r--r-- | mandoc.c | 25 |
1 files changed, 16 insertions, 9 deletions
@@ -1,4 +1,4 @@ -/* $Id: mandoc.c,v 1.117 2020/01/19 16:44:50 schwarze Exp $ */ +/* $Id: mandoc.c,v 1.118 2020/10/24 22:57:39 schwarze Exp $ */ /* * Copyright (c) 2008-2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2011-2015, 2017-2020 Ingo Schwarze <schwarze@openbsd.org> @@ -203,7 +203,18 @@ mandoc_escape(const char **end, const char **start, int *sz) case 'O': case 'V': case 'Y': - gly = (*start)[-1] == 'f' ? ESCAPE_FONT : ESCAPE_IGNORE; + case '*': + switch ((*start)[-1]) { + case 'f': + gly = ESCAPE_FONT; + break; + case '*': + gly = ESCAPE_DEVICE; + break; + default: + gly = ESCAPE_IGNORE; + break; + } switch (**start) { case '(': if ((*start)[-1] == 'O') @@ -238,13 +249,6 @@ mandoc_escape(const char **end, const char **start, int *sz) break; } break; - case '*': - if (strncmp(*start, "(.T", 3) != 0) - abort(); - gly = ESCAPE_DEVICE; - *start = ++*end; - *sz = 2; - break; /* * These escapes are of the form \X'Y', where 'X' is the trigger @@ -459,6 +463,9 @@ mandoc_escape(const char **end, const char **start, int *sz) + 1 == *sz) gly = ESCAPE_UNICODE; break; + case ESCAPE_DEVICE: + assert(*sz == 2 && (*start)[0] == '.' && (*start)[1] == 'T'); + break; default: break; } |