diff options
| author |   Ingo Schwarze <schwarze@openbsd.org> | 2017-03-06 14:58:10 +0000 |
|---|---|---|
| committer | Ingo Schwarze <schwarze@openbsd.org> | 2017-03-06 14:58:10 +0000 |
| commit | 2da973e1cbee8826e4ccfd50d7f8ab5517bd9006 (patch) | |
| tree | bb99398842f87ef9532c04f63482802f27d9fab5 /mdoc_markdown.c | |
| parent | fa99e371284a414ce8b13892006df003d31a0e37 (diff) | |
| download | mandoc-2da973e1cbee8826e4ccfd50d7f8ab5517bd9006.tar.gz mandoc-2da973e1cbee8826e4ccfd50d7f8ab5517bd9006.tar.zst mandoc-2da973e1cbee8826e4ccfd50d7f8ab5517bd9006.zip | |
URIs need different escaping; reported by reyk@
Diffstat (limited to 'mdoc_markdown.c')
| -rw-r--r-- | mdoc_markdown.c | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/mdoc_markdown.c b/mdoc_markdown.c index cb1bdfa3..e43eb568 100644 --- a/mdoc_markdown.c +++ b/mdoc_markdown.c @@ -1,4 +1,4 @@ -/* $Id: mdoc_markdown.c,v 1.2 2017/03/04 21:41:29 schwarze Exp $ */ +/* $Id: mdoc_markdown.c,v 1.3 2017/03/06 14:58:10 schwarze Exp $ */ /* * Copyright (c) 2017 Ingo Schwarze <schwarze@openbsd.org> * @@ -220,7 +220,7 @@ static const struct md_act md_acts[MDOC_MAX + 1] = { { NULL, NULL, md_post_pc, NULL, NULL }, /* %Q */ { NULL, md_pre_br, NULL, NULL, NULL }, /* br */ { NULL, md_pre_Pp, NULL, NULL, NULL }, /* sp */ - { NULL, NULL, md_post_pc, NULL, NULL }, /* %U */ + { NULL, md_pre_Lk, md_post_pc, NULL, NULL }, /* %U */ { NULL, NULL, NULL, NULL, NULL }, /* Ta */ { NULL, NULL, NULL, NULL, NULL }, /* ll */ { NULL, NULL, NULL, NULL, NULL }, /* ROOT */ @@ -1235,6 +1235,7 @@ static int md_pre_Lk(struct roff_node *n) { const struct roff_node *link, *descr; + const unsigned char *s; if ((link = n->child) == NULL) return 0; @@ -1251,8 +1252,16 @@ md_pre_Lk(struct roff_node *n) } else md_rawword("<"); - outflags &= ~MD_spc; - md_word(link->string); + for (s = link->string; *s != '\0'; s++) { + if (strchr("%)<>", *s) != NULL) { + printf("%%%2.2hhX", *s); + outcount += 3; + } else { + putchar(*s); + outcount++; + } + } + outflags &= ~MD_spc; md_rawword(link->next == NULL ? ">" : ")"); return 0; |