From owner-dev-commits-ports-all@freebsd.org Wed Sep 8 19:07:15 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 0E68D660035; Wed, 8 Sep 2021 19:07:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4H4Wpp6vDcz3Qln; Wed, 8 Sep 2021 19:07:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id CCA93349F; Wed, 8 Sep 2021 19:07:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 188J7Evw075774; Wed, 8 Sep 2021 19:07:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 188J7EZU075773; Wed, 8 Sep 2021 19:07:14 GMT (envelope-from git) Date: Wed, 8 Sep 2021 19:07:14 GMT Message-Id: <202109081907.188J7EZU075773@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Tobias Kortkamp Subject: git: 217c3e9d7280 - main - Scripts/split-url.awk: Split query strings too MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tobik X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 217c3e9d72809ea59cc041ee83bcc49080c9eef5 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 Sep 2021 19:07:15 -0000 The branch main has been updated by tobik: URL: https://cgit.FreeBSD.org/ports/commit/?id=217c3e9d72809ea59cc041ee83bcc49080c9eef5 commit 217c3e9d72809ea59cc041ee83bcc49080c9eef5 Author: Tobias Kortkamp AuthorDate: 2021-09-07 20:12:43 +0000 Commit: Tobias Kortkamp 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)