diff options
| author |   schwarze <schwarze@openbsd.org> | 2014-04-07 17:50:43 +0000 |
|---|---|---|
| committer | schwarze <schwarze@openbsd.org> | 2014-04-07 17:50:43 +0000 |
| commit | 0b9ca9772e94970d84d4d50c264bc7bd0dccc8a8 (patch) | |
| tree | 024c605c26105143407eeb93b787d820c9fe7867 | |
| parent | Back out rev 1.30, our less does actually support the old-style more (diff) | |
| download | wireguard-openbsd-0b9ca9772e94970d84d4d50c264bc7bd0dccc8a8.tar.xz wireguard-openbsd-0b9ca9772e94970d84d4d50c264bc7bd0dccc8a8.zip | |
Accept arbitrary argument delimiters for various roff(7) escape sequences.
Needed for example by the new Perl pod2man(1) preamble.
| -rw-r--r-- | usr.bin/mandoc/mandoc.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/usr.bin/mandoc/mandoc.c b/usr.bin/mandoc/mandoc.c index 92f888bdb25..f7a70ee0ae0 100644 --- a/usr.bin/mandoc/mandoc.c +++ b/usr.bin/mandoc/mandoc.c @@ -1,4 +1,4 @@ -/* $Id: mandoc.c,v 1.45 2014/03/21 22:17:01 schwarze Exp $ */ +/* $Id: mandoc.c,v 1.46 2014/04/07 17:50:43 schwarze Exp $ */ /* * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2011, 2012, 2013 Ingo Schwarze <schwarze@openbsd.org> @@ -175,11 +175,11 @@ mandoc_escape(const char **end, const char **start, int *sz) case ('X'): /* FALLTHROUGH */ case ('Z'): - if ('\'' != **start) + if ('\0' == **start) return(ESCAPE_ERROR); gly = ESCAPE_IGNORE; + term = **start; *start = ++*end; - term = '\''; break; /* @@ -199,11 +199,11 @@ mandoc_escape(const char **end, const char **start, int *sz) case ('v'): /* FALLTHROUGH */ case ('x'): - if ('\'' != **start) + if (strchr("\0 %&()*+-./0123456789:<=>", **start)) return(ESCAPE_ERROR); gly = ESCAPE_IGNORE; + term = **start; *start = ++*end; - term = '\''; break; /* |