Date: Wed, 8 Sep 2021 19:07:14 GMT From: Tobias Kortkamp <tobik@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 217c3e9d7280 - main - Scripts/split-url.awk: Split query strings too Message-ID: <202109081907.188J7EZU075773@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by tobik: URL: https://cgit.FreeBSD.org/ports/commit/?id=217c3e9d72809ea59cc041ee83bcc49080c9eef5 commit 217c3e9d72809ea59cc041ee83bcc49080c9eef5 Author: Tobias Kortkamp <tobik@FreeBSD.org> AuthorDate: 2021-09-07 20:12:43 +0000 Commit: Tobias Kortkamp <tobik@FreeBSD.org> CommitDate: 2021-09-08 19:05:18 +0000 Scripts/split-url.awk: Split query strings too Also reset state on function entry otherwise split_url() cannot really be called multiple times since there would be garbage values in the url array from previous calls. --- Mk/Scripts/split-url.awk | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/Mk/Scripts/split-url.awk b/Mk/Scripts/split-url.awk index 34506b527dd8..f62af4219ad6 100644 --- a/Mk/Scripts/split-url.awk +++ b/Mk/Scripts/split-url.awk @@ -1,4 +1,5 @@ -function split_url(s, url_scheme, url_fragment, url_query, url_authority, url_auth, url_user, url_host) { +function split_url(s, url_scheme, url_fragment, url_query, url_query_parts, i, url_query_part, url_authority, url_auth, url_user, url_host) { + delete url # scheme:[//[user[:password]@]host[:port]][/path][?query][#fragment] split(s, url_scheme, "://") url["scheme"] = url_scheme[1] @@ -7,7 +8,15 @@ function split_url(s, url_scheme, url_fragment, url_query, url_authority, url_au url["fragment"] = url_fragment[2] split(url_fragment[1], url_query, "?") - url["query"] = url_query[2] + + split(url_query[2], url_query_parts, "&") + # url["query"] list of query keys (space separated) + # url["query", key] value + for (i = 1; i <= length(url_query_parts); i++) { + split(url_query_parts[i], url_query_part, "=") + url["query"] = url["query"] " " url_query_part[1] + url["query", url_query_part[1]] = url_query_part[2] + } split(url_query[1], url_authority, "/") url["path"] = substr(url_query[1], length(url_authority[1]) + 1)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202109081907.188J7EZU075773>