From 54b377278187f02621a60b3585de4ec02399234a Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Mon, 22 Jun 2020 10:27:47 -0700 Subject: Re-add `--safe` command-line option as a no-op. See #344. --- man/man1/cmark.1 | 12 ++++++++---- src/main.c | 3 +++ 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/man/man1/cmark.1 b/man/man1/cmark.1 index 71db059..0771400 100644 --- a/man/man1/cmark.1 +++ b/man/man1/cmark.1 @@ -49,14 +49,18 @@ be rendered as curly quotes, depending on their position. \f[C]\-\-\-\f[] will be rendered as an em-dash. \f[C]...\f[] will be rendered as ellipses. .TP 12n -.B \-\-unsafe -Render raw HTML or potentially dangerous URLs. -By default, raw HTML is replaced by a placeholder comment +.B \-\-safe +Omit raw HTML and potentially dangerous URLs (default). +Raw HTML is replaced by a placeholder comment and potentially dangerous URLs are replaced by empty strings. -Dangerous URLs are those that begin with `javascript:`, +Potentially dangerous URLs are those that begin with `javascript:`, `vbscript:`, `file:`, or `data:` (except for `image/png`, `image/gif`, `image/jpeg`, or `image/webp` mime types). .TP 12n +.B \-\-unsafe +Render raw HTML or potentially dangerous URLs, overriding +the default (\-\-safe) behavior. +.TP 12n .B \-\-help Print usage information. .TP 12n diff --git a/src/main.c b/src/main.c index 6162704..0cc2b3d 100644 --- a/src/main.c +++ b/src/main.c @@ -37,6 +37,7 @@ void print_usage() { printf(" --sourcepos Include source position attribute\n"); printf(" --hardbreaks Treat newlines as hard line breaks\n"); printf(" --nobreaks Render soft line breaks as spaces\n"); + printf(" --safe Omit raw HTML and dangerous URLs\n"); printf(" --unsafe Render raw HTML and dangerous URLs\n"); printf(" --smart Use smart punctuation\n"); printf(" --validate-utf8 Replace invalid UTF-8 sequences with U+FFFD\n"); @@ -111,6 +112,8 @@ int main(int argc, char *argv[]) { options |= CMARK_OPT_NOBREAKS; } else if (strcmp(argv[i], "--smart") == 0) { options |= CMARK_OPT_SMART; + } else if (strcmp(argv[i], "--safe") == 0) { + options |= CMARK_OPT_SAFE; } else if (strcmp(argv[i], "--unsafe") == 0) { options |= CMARK_OPT_UNSAFE; } else if (strcmp(argv[i], "--validate-utf8") == 0) { -- cgit v1.2.3