diff options
author | David Robillard <d@drobilla.net> | 2018-06-13 17:11:13 -0400 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2018-11-25 22:12:47 +0100 |
commit | 191392584bebb14bed9bb325f54a035e0072622a (patch) | |
tree | 928b4df5bb0f991fb7b15fb257486ef29fc8ca57 /src | |
parent | 29f0cefc019e8e93e8ae9bb016c8dc93711173a0 (diff) | |
download | serd-191392584bebb14bed9bb325f54a035e0072622a.tar.gz serd-191392584bebb14bed9bb325f54a035e0072622a.tar.bz2 serd-191392584bebb14bed9bb325f54a035e0072622a.zip |
Remove escape parameter from serd_new_file_uri
Since characters are escaped because they are not valid characters in a URI,
any use of this function without escaping is problematic at best.
Diffstat (limited to 'src')
-rw-r--r-- | src/node.c | 4 | ||||
-rw-r--r-- | src/serdi.c | 2 |
2 files changed, 3 insertions, 3 deletions
@@ -387,7 +387,7 @@ is_uri_path_char(const char c) } SerdNode* -serd_new_file_uri(const char* path, const char* hostname, bool escape) +serd_new_file_uri(const char* path, const char* hostname) { const size_t path_len = strlen(path); const size_t hostname_len = hostname ? strlen(hostname) : 0; @@ -408,7 +408,7 @@ serd_new_file_uri(const char* path, const char* hostname, bool escape) serd_buffer_sink("/", 1, 1, &buffer); } else if (path[i] == '%') { serd_buffer_sink("%%", 1, 2, &buffer); - } else if (!escape || is_uri_path_char(path[i])) { + } else if (is_uri_path_char(path[i])) { serd_buffer_sink(path + i, 1, 1, &buffer); } else { char escape_str[4] = { '%', 0, 0, 0 }; diff --git a/src/serdi.c b/src/serdi.c index 8a9e0c79..7543ed7c 100644 --- a/src/serdi.c +++ b/src/serdi.c @@ -186,7 +186,7 @@ main(int argc, char** argv) if (a < argc) { // Base URI given on command line base = serd_new_uri((const char*)argv[a]); } else if (!from_string && !from_stdin) { // Use input file URI - base = serd_new_file_uri(input, NULL, true); + base = serd_new_file_uri(input, NULL); } FILE* out_fd = stdout; |