From nobody Tue Nov 26 18:35:52 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1706092986; cv=none; d=zohomail.com; s=zohoarc; b=UQ6dj5FT2DN71lRUiJwBY6Yto2qwAiOozHGSubqQZxZZGoHsaE8FAVZjMh1G8wsBBukXFtsloLtW5cHXmtFeGDicmK1608arRENdIBqYxsWtKzCKBb301uth/ejUoN/6yR4N+xrtQh8jJEMR209hq00QxpbwSztBavz8K4zS30Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1706092986; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=xEohwW+frIHgQpcT2dkOzL2eiqZNhael6KKxnjbb308=; b=CEw1FpE3Jk52KKcMqU20AAS2iu4dsMBAcdsrchFImjeRrvQ6oqsVtLDNAn8x9uuNIiqVEjjNtOEFX3frvHCeZZUvXm34lFMjlYjPeHmEvJn6j4YER8WIkr4QOa1xsFq5VeXKwFIGN6n44i5jivlKizFF9PS7dKiBHe1b4Kcgq+Q= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1706092986798504.97681979880053; Wed, 24 Jan 2024 02:43:06 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rSaiU-0008C9-PA; Wed, 24 Jan 2024 05:42:46 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rSaiS-0008BT-Kb for qemu-devel@nongnu.org; Wed, 24 Jan 2024 05:42:44 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rSaiQ-0008Es-Pm for qemu-devel@nongnu.org; Wed, 24 Jan 2024 05:42:44 -0500 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-335-ei4pEaRZP7irVGfJCjJ3Kg-1; Wed, 24 Jan 2024 05:42:39 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 9D14C80007C; Wed, 24 Jan 2024 10:42:39 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.194.115]) by smtp.corp.redhat.com (Postfix) with ESMTP id D35A551D5; Wed, 24 Jan 2024 10:42:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1706092962; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=xEohwW+frIHgQpcT2dkOzL2eiqZNhael6KKxnjbb308=; b=PZ0ncUjBUV158TKxB/c3AycyyCbdbLeDIhQqcj222LCr+brRYZKWw6qxODvMpb7TLV+9sL bAs57Q/inVD4xev8mOMH3j+LSNNJKz4ESc0dHjlvDOHx4YqQUXfLf6Xk+KBG7rlMkvpmHi Ji1Qg5HPG/3Vo/uuAEMysJFoCTQJGzU= X-MC-Unique: ei4pEaRZP7irVGfJCjJ3Kg-1 From: Thomas Huth To: qemu-devel@nongnu.org Cc: Peter Maydell Subject: [PULL 4/7] util/uri: Remove uri_string_unescape() Date: Wed, 24 Jan 2024 11:42:28 +0100 Message-ID: <20240124104231.603418-5-thuth@redhat.com> In-Reply-To: <20240124104231.603418-1-thuth@redhat.com> References: <20240124104231.603418-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.5 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -33 X-Spam_score: -3.4 X-Spam_bar: --- X-Spam_report: (-3.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.327, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1706092988503100003 Content-Type: text/plain; charset="utf-8" uri_string_unescape() basically does the same as the glib function g_uri_unescape_segment(). So we can get rid of our implementation completely by simply using the glib function instead. Suggested-by: Stefan Weil Suggested-by: Paolo Bonzini Message-ID: <20240123182247.432642-2-thuth@redhat.com> Reviewed-by: Richard Henderson Reviewed-by: Stefan Weil Signed-off-by: Thomas Huth --- include/qemu/uri.h | 1 - util/uri.c | 97 ++++++---------------------------------------- 2 files changed, 11 insertions(+), 87 deletions(-) diff --git a/include/qemu/uri.h b/include/qemu/uri.h index 1855b764f2..f0722b75da 100644 --- a/include/qemu/uri.h +++ b/include/qemu/uri.h @@ -79,7 +79,6 @@ URI *uri_parse_raw(const char *str, int raw); int uri_parse_into(URI *uri, const char *str); char *uri_to_string(URI *uri); char *uri_string_escape(const char *str, const char *list); -char *uri_string_unescape(const char *str, int len, char *target); void uri_free(URI *uri); =20 /* Single web service query parameter 'name=3Dvalue'. */ diff --git a/util/uri.c b/util/uri.c index dcb3305236..fb7823a43c 100644 --- a/util/uri.c +++ b/util/uri.c @@ -267,7 +267,7 @@ static int rfc3986_parse_fragment(URI *uri, const char = **str) if (uri->cleanup & 2) { uri->fragment =3D g_strndup(*str, cur - *str); } else { - uri->fragment =3D uri_string_unescape(*str, cur - *str, NULL); + uri->fragment =3D g_uri_unescape_segment(*str, cur, NULL); } } *str =3D cur; @@ -368,7 +368,7 @@ static int rfc3986_parse_user_info(URI *uri, const char= **str) if (uri->cleanup & 2) { uri->user =3D g_strndup(*str, cur - *str); } else { - uri->user =3D uri_string_unescape(*str, cur - *str, NULL); + uri->user =3D g_uri_unescape_segment(*str, cur, NULL); } } *str =3D cur; @@ -496,7 +496,7 @@ found: if (uri->cleanup & 2) { uri->server =3D g_strndup(host, cur - host); } else { - uri->server =3D uri_string_unescape(host, cur - host, NULL= ); + uri->server =3D g_uri_unescape_segment(host, cur, NULL); } } else { uri->server =3D NULL; @@ -614,7 +614,7 @@ static int rfc3986_parse_path_ab_empty(URI *uri, const = char **str) if (uri->cleanup & 2) { uri->path =3D g_strndup(*str, cur - *str); } else { - uri->path =3D uri_string_unescape(*str, cur - *str, NULL); + uri->path =3D g_uri_unescape_segment(*str, cur, NULL); } } else { uri->path =3D NULL; @@ -663,7 +663,7 @@ static int rfc3986_parse_path_absolute(URI *uri, const = char **str) if (uri->cleanup & 2) { uri->path =3D g_strndup(*str, cur - *str); } else { - uri->path =3D uri_string_unescape(*str, cur - *str, NULL); + uri->path =3D g_uri_unescape_segment(*str, cur, NULL); } } else { uri->path =3D NULL; @@ -709,7 +709,7 @@ static int rfc3986_parse_path_rootless(URI *uri, const = char **str) if (uri->cleanup & 2) { uri->path =3D g_strndup(*str, cur - *str); } else { - uri->path =3D uri_string_unescape(*str, cur - *str, NULL); + uri->path =3D g_uri_unescape_segment(*str, cur, NULL); } } else { uri->path =3D NULL; @@ -755,7 +755,7 @@ static int rfc3986_parse_path_no_scheme(URI *uri, const= char **str) if (uri->cleanup & 2) { uri->path =3D g_strndup(*str, cur - *str); } else { - uri->path =3D uri_string_unescape(*str, cur - *str, NULL); + uri->path =3D g_uri_unescape_segment(*str, cur, NULL); } } else { uri->path =3D NULL; @@ -1561,81 +1561,6 @@ done_cd: return 0; } =20 -static int is_hex(char c) -{ - if (((c >=3D '0') && (c <=3D '9')) || ((c >=3D 'a') && (c <=3D 'f')) || - ((c >=3D 'A') && (c <=3D 'F'))) { - return 1; - } - return 0; -} - -/** - * uri_string_unescape: - * @str: the string to unescape - * @len: the length in bytes to unescape (or <=3D 0 to indicate full str= ing) - * @target: optional destination buffer - * - * Unescaping routine, but does not check that the string is an URI. The - * output is a direct unsigned char translation of %XX values (no encoding) - * Note that the length of the result can only be smaller or same size as - * the input string. - * - * Returns a copy of the string, but unescaped, will return NULL only in c= ase - * of error - */ -char *uri_string_unescape(const char *str, int len, char *target) -{ - char *ret, *out; - const char *in; - - if (str =3D=3D NULL) { - return NULL; - } - if (len <=3D 0) { - len =3D strlen(str); - } - if (len < 0) { - return NULL; - } - - if (target =3D=3D NULL) { - ret =3D g_malloc(len + 1); - } else { - ret =3D target; - } - in =3D str; - out =3D ret; - while (len > 0) { - if ((len > 2) && (*in =3D=3D '%') && (is_hex(in[1])) && (is_hex(in= [2]))) { - in++; - if ((*in >=3D '0') && (*in <=3D '9')) { - *out =3D (*in - '0'); - } else if ((*in >=3D 'a') && (*in <=3D 'f')) { - *out =3D (*in - 'a') + 10; - } else if ((*in >=3D 'A') && (*in <=3D 'F')) { - *out =3D (*in - 'A') + 10; - } - in++; - if ((*in >=3D '0') && (*in <=3D '9')) { - *out =3D *out * 16 + (*in - '0'); - } else if ((*in >=3D 'a') && (*in <=3D 'f')) { - *out =3D *out * 16 + (*in - 'a') + 10; - } else if ((*in >=3D 'A') && (*in <=3D 'F')) { - *out =3D *out * 16 + (*in - 'A') + 10; - } - in++; - len -=3D 3; - out++; - } else { - *out++ =3D *in++; - len--; - } - } - *out =3D 0; - return ret; -} - /** * uri_string_escape: * @str: string to escape @@ -2274,14 +2199,14 @@ struct QueryParams *query_params_parse(const char *= query) * and consistent with CGI.pm we assume value is "". */ else if (!eq) { - name =3D uri_string_unescape(query, end - query, NULL); + name =3D g_uri_unescape_segment(query, end, NULL); value =3D NULL; } /* Or if we have "name=3D" here (works around annoying * problem when calling uri_string_unescape with len =3D 0). */ else if (eq + 1 =3D=3D end) { - name =3D uri_string_unescape(query, eq - query, NULL); + name =3D g_uri_unescape_segment(query, eq, NULL); value =3D g_new0(char, 1); } /* If the '=3D' character is at the beginning then we have @@ -2293,8 +2218,8 @@ struct QueryParams *query_params_parse(const char *qu= ery) =20 /* Otherwise it's "name=3Dvalue". */ else { - name =3D uri_string_unescape(query, eq - query, NULL); - value =3D uri_string_unescape(eq + 1, end - (eq + 1), NULL); + name =3D g_uri_unescape_segment(query, eq, NULL); + value =3D g_uri_unescape_segment(eq + 1, end, NULL); } =20 /* Append to the parameter set. */ --=20 2.43.0