From 6d68e49cf09c30fc6bb4d0bd7af8047237b7e1cc Mon Sep 17 00:00:00 2001 From: itchyny Date: Sun, 4 Jun 2023 11:44:26 +0900 Subject: [PATCH] Fix uri format to follow RFC 3986 --- src/builtin.c | 2 +- tests/jq.test | 22 +++++++++++----------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/builtin.c b/src/builtin.c index 9b2d9a23fc..79e96367fc 100644 --- a/src/builtin.c +++ b/src/builtin.c @@ -642,7 +642,7 @@ static jv f_format(jq_state *jq, jv input, jv fmt) { input = f_tostring(jq, input); int unreserved[128] = {0}; - const char* p = CHARS_ALPHANUM "-_.!~*'()"; + const char* p = CHARS_ALPHANUM "-_.~"; while (*p) unreserved[(int)*p++] = 1; jv line = jv_string(""); diff --git a/tests/jq.test b/tests/jq.test index ca8e27059f..b8364f2a77 100644 --- a/tests/jq.test +++ b/tests/jq.test @@ -61,17 +61,17 @@ null null "interpolation" -@text,@json,([1,.] | (@csv, @tsv)),@html,@uri,@sh,@base64,(@base64 | @base64d) -"<>&'\"\t" -"<>&'\"\t" -"\"<>&'\\\"\\t\"" -"1,\"<>&'\"\"\t\"" -"1\t<>&'\"\\t" -"<>&'"\t" -"%3C%3E%26'%22%09" -"'<>&'\\''\"\t'" -"PD4mJyIJ" -"<>&'\"\t" +@text,@json,([1,.]|@csv,@tsv),@html,@uri,@sh,(@base64|.,@base64d) +"!()<>&'\"\t" +"!()<>&'\"\t" +"\"!()<>&'\\\"\\t\"" +"1,\"!()<>&'\"\"\t\"" +"1\t!()<>&'\"\\t" +"!()<>&'"\t" +"%21%28%29%3C%3E%26%27%22%09" +"'!()<>&'\\''\"\t'" +"ISgpPD4mJyIJ" +"!()<>&'\"\t" # regression test for #436 @base64