From nobody Tue Nov 26 19:54:10 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=1705951146; cv=none; d=zohomail.com; s=zohoarc; b=SOyj0rmiPzafUqgnjOe/vreGjlZbPvvtKFGHR4ev0kaL/y8Ev/2X462oPc7rFnHF069l9DbnXpmGGHAfvCIdVANTlZnM4fk/e5lH6TC44CVpkLjc3NT+qNmyHWxyfI7Hd8WLi/pSVACuJYz7f/Rx8HbuZ7RgN/JgpM3RNfjaIiM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1705951146; 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=7+Y2LgM96b1Q3n00WQ/2urzrj/xWwpdMInz6c3wSJ8M=; b=UpTg17hAappdIvHbg+dK71HN4epFTEHhTOWddJNHK0PrsAsRVI2lnUIkozXNEL65/i44LkR2t5xCXuA/FHKAAuef2WEr83PQMiTcvJw89FObgbR0D+sSiHxS0WIVGUGJMv1q+9RZYgmd5ges1kBBloKX0g/g0Jd/3keA9RKOlrQ= 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 1705951146361826.3941704947257; Mon, 22 Jan 2024 11:19:06 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rRzoD-0007pn-Ni; Mon, 22 Jan 2024 14:18:13 -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 1rRzoB-0007og-Ds for qemu-devel@nongnu.org; Mon, 22 Jan 2024 14:18:11 -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 1rRzo8-0004bV-8G for qemu-devel@nongnu.org; Mon, 22 Jan 2024 14:18:11 -0500 Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-629-kPu1U2QUN_-1PvS7w_QqkA-1; Mon, 22 Jan 2024 14:18:04 -0500 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (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 A36401C05AF5; Mon, 22 Jan 2024 19:18:03 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.193.179]) by smtp.corp.redhat.com (Postfix) with ESMTP id DBDDD492BC6; Mon, 22 Jan 2024 19:18:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1705951087; 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=7+Y2LgM96b1Q3n00WQ/2urzrj/xWwpdMInz6c3wSJ8M=; b=BPw3CSnG/hKGmCYBTH1ZU9ujqeEoPKv1c3+Tx8xNAv7dHoGf3qaHspMkF97aHs0smpOQll o+rQFsaVgsykE0ZXOOcOOYdMiCQYVbTRAxjV7UUQGtgdbqFDIZ7vCX4zluRnpa8f6xItHN Ds0xYzj8k5hD8BaRHEt4B3BUsjdc8NA= X-MC-Unique: kPu1U2QUN_-1PvS7w_QqkA-1 From: Thomas Huth To: qemu-devel@nongnu.org, Paolo Bonzini Cc: Stefan Weil , qemu-trivial@nongnu.org Subject: [PATCH 4/5] util/uri: Remove unused functions uri_resolve() and uri_resolve_relative() Date: Mon, 22 Jan 2024 20:17:52 +0100 Message-ID: <20240122191753.103118-5-thuth@redhat.com> In-Reply-To: <20240122191753.103118-1-thuth@redhat.com> References: <20240122191753.103118-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.9 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.289, 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=unavailable 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: 1705951147349100003 Content-Type: text/plain; charset="utf-8" These rather complex functions have never been used since they've been introduced in 2012, so looks like they are not really useful for QEMU. And since the static normalize_uri_path() function is also only used by uri_resolve(), we can remove that function now, too. Signed-off-by: Thomas Huth Reviewed-by: Stefan Weil --- include/qemu/uri.h | 2 - util/uri.c | 689 --------------------------------------------- 2 files changed, 691 deletions(-) diff --git a/include/qemu/uri.h b/include/qemu/uri.h index c1734d28c3..93538b7578 100644 --- a/include/qemu/uri.h +++ b/include/qemu/uri.h @@ -72,8 +72,6 @@ typedef struct URI { } URI; =20 URI *uri_new(void); -char *uri_resolve(const char *URI, const char *base); -char *uri_resolve_relative(const char *URI, const char *base); URI *uri_parse(const char *str); URI *uri_parse_raw(const char *str, int raw); int uri_parse_into(URI *uri, const char *str); diff --git a/util/uri.c b/util/uri.c index 912e406523..5f5ca79792 100644 --- a/util/uri.c +++ b/util/uri.c @@ -1355,212 +1355,6 @@ void uri_free(URI *uri) * * ************************************************************************/ =20 -/** - * normalize_uri_path: - * @path: pointer to the path string - * - * Applies the 5 normalization steps to a path string--that is, RFC 2396 - * Section 5.2, steps 6.c through 6.g. - * - * Normalization occurs directly on the string, no new allocation is done - * - * Returns 0 or an error code - */ -static int normalize_uri_path(char *path) -{ - char *cur, *out; - - if (path =3D=3D NULL) { - return -1; - } - - /* Skip all initial "/" chars. We want to get to the beginning of the - * first non-empty segment. - */ - cur =3D path; - while (cur[0] =3D=3D '/') { - ++cur; - } - if (cur[0] =3D=3D '\0') { - return 0; - } - - /* Keep everything we've seen so far. */ - out =3D cur; - - /* - * Analyze each segment in sequence for cases (c) and (d). - */ - while (cur[0] !=3D '\0') { - /* - * c) All occurrences of "./", where "." is a complete path segmen= t, - * are removed from the buffer string. - */ - if ((cur[0] =3D=3D '.') && (cur[1] =3D=3D '/')) { - cur +=3D 2; - /* '//' normalization should be done at this point too */ - while (cur[0] =3D=3D '/') { - cur++; - } - continue; - } - - /* - * d) If the buffer string ends with "." as a complete path segmen= t, - * that "." is removed. - */ - if ((cur[0] =3D=3D '.') && (cur[1] =3D=3D '\0')) { - break; - } - - /* Otherwise keep the segment. */ - while (cur[0] !=3D '/') { - if (cur[0] =3D=3D '\0') { - goto done_cd; - } - (out++)[0] =3D (cur++)[0]; - } - /* nomalize // */ - while ((cur[0] =3D=3D '/') && (cur[1] =3D=3D '/')) { - cur++; - } - - (out++)[0] =3D (cur++)[0]; - } -done_cd: - out[0] =3D '\0'; - - /* Reset to the beginning of the first segment for the next sequence. = */ - cur =3D path; - while (cur[0] =3D=3D '/') { - ++cur; - } - if (cur[0] =3D=3D '\0') { - return 0; - } - - /* - * Analyze each segment in sequence for cases (e) and (f). - * - * e) All occurrences of "/../", where is a - * complete path segment not equal to "..", are removed from the - * buffer string. Removal of these path segments is performed - * iteratively, removing the leftmost matching pattern on each - * iteration, until no matching pattern remains. - * - * f) If the buffer string ends with "/..", where - * is a complete path segment not equal to "..", that - * "/.." is removed. - * - * To satisfy the "iterative" clause in (e), we need to collapse the - * string every time we find something that needs to be removed. Thus, - * we don't need to keep two pointers into the string: we only need a - * "current position" pointer. - */ - while (1) { - char *segp, *tmp; - - /* At the beginning of each iteration of this loop, "cur" points to - * the first character of the segment we want to examine. - */ - - /* Find the end of the current segment. */ - segp =3D cur; - while ((segp[0] !=3D '/') && (segp[0] !=3D '\0')) { - ++segp; - } - - /* If this is the last segment, we're done (we need at least two - * segments to meet the criteria for the (e) and (f) cases). - */ - if (segp[0] =3D=3D '\0') { - break; - } - - /* If the first segment is "..", or if the next segment _isn't_ ".= .", - * keep this segment and try the next one. - */ - ++segp; - if (((cur[0] =3D=3D '.') && (cur[1] =3D=3D '.') && (segp =3D=3D cu= r + 3)) || - ((segp[0] !=3D '.') || (segp[1] !=3D '.') || - ((segp[2] !=3D '/') && (segp[2] !=3D '\0')))) { - cur =3D segp; - continue; - } - - /* If we get here, remove this segment and the next one and back up - * to the previous segment (if there is one), to implement the - * "iteratively" clause. It's pretty much impossible to back up - * while maintaining two pointers into the buffer, so just compact - * the whole buffer now. - */ - - /* If this is the end of the buffer, we're done. */ - if (segp[2] =3D=3D '\0') { - cur[0] =3D '\0'; - break; - } - /* Valgrind complained, strcpy(cur, segp + 3); */ - /* string will overlap, do not use strcpy */ - tmp =3D cur; - segp +=3D 3; - while ((*tmp++ =3D *segp++) !=3D 0) { - /* No further work */ - } - - /* If there are no previous segments, then keep going from here. = */ - segp =3D cur; - while ((segp > path) && ((--segp)[0] =3D=3D '/')) { - /* No further work */ - } - if (segp =3D=3D path) { - continue; - } - - /* "segp" is pointing to the end of a previous segment; find it's - * start. We need to back up to the previous segment and start - * over with that to handle things like "foo/bar/../..". If we - * don't do this, then on the first pass we'll remove the "bar/..", - * but be pointing at the second ".." so we won't realize we can a= lso - * remove the "foo/..". - */ - cur =3D segp; - while ((cur > path) && (cur[-1] !=3D '/')) { - --cur; - } - } - out[0] =3D '\0'; - - /* - * g) If the resulting buffer string still begins with one or more - * complete path segments of "..", then the reference is - * considered to be in error. Implementations may handle this - * error by retaining these components in the resolved path (i.e., - * treating them as part of the final URI), by removing them from - * the resolved path (i.e., discarding relative levels above the - * root), or by avoiding traversal of the reference. - * - * We discard them from the final path. - */ - if (path[0] =3D=3D '/') { - cur =3D path; - while ((cur[0] =3D=3D '/') && (cur[1] =3D=3D '.') && (cur[2] =3D= =3D '.') && - ((cur[3] =3D=3D '/') || (cur[3] =3D=3D '\0'))) { - cur +=3D 3; - } - - if (cur !=3D path) { - out =3D path; - while (cur[0] !=3D '\0') { - (out++)[0] =3D (cur++)[0]; - } - out[0] =3D 0; - } - } - - return 0; -} - /** * uri_string_unescape: * @str: the string to unescape @@ -1595,489 +1389,6 @@ char *uri_string_unescape(const char *str, int len) * * ************************************************************************/ =20 -/** - * uri_resolve: - * @URI: the URI instance found in the document - * @base: the base value - * - * Computes he final URI of the reference done by checking that - * the given URI is valid, and building the final URI using the - * base URI. This is processed according to section 5.2 of the - * RFC 2396 - * - * 5.2. Resolving Relative References to Absolute Form - * - * Returns a new URI string (to be freed by the caller) or NULL in case - * of error. - */ -char *uri_resolve(const char *uri, const char *base) -{ - char *val =3D NULL; - int ret, len, indx, cur, out; - URI *ref =3D NULL; - URI *bas =3D NULL; - URI *res =3D NULL; - - /* - * 1) The URI reference is parsed into the potential four components a= nd - * fragment identifier, as described in Section 4.3. - * - * NOTE that a completely empty URI is treated by modern browsers - * as a reference to "." rather than as a synonym for the current - * URI. Should we do that here? - */ - if (uri =3D=3D NULL) { - ret =3D -1; - } else { - if (*uri) { - ref =3D uri_new(); - ret =3D uri_parse_into(ref, uri); - } else { - ret =3D 0; - } - } - if (ret !=3D 0) { - goto done; - } - if ((ref !=3D NULL) && (ref->scheme !=3D NULL)) { - /* - * The URI is absolute don't modify. - */ - val =3D g_strdup(uri); - goto done; - } - if (base =3D=3D NULL) { - ret =3D -1; - } else { - bas =3D uri_new(); - ret =3D uri_parse_into(bas, base); - } - if (ret !=3D 0) { - if (ref) { - val =3D uri_to_string(ref); - } - goto done; - } - if (ref =3D=3D NULL) { - /* - * the base fragment must be ignored - */ - g_free(bas->fragment); - bas->fragment =3D NULL; - val =3D uri_to_string(bas); - goto done; - } - - /* - * 2) If the path component is empty and the scheme, authority, and - * query components are undefined, then it is a reference to the - * current document and we are done. Otherwise, the reference URI's - * query and fragment components are defined as found (or not found) - * within the URI reference and not inherited from the base URI. - * - * NOTE that in modern browsers, the parsing differs from the above - * in the following aspect: the query component is allowed to be - * defined while still treating this as a reference to the current - * document. - */ - res =3D uri_new(); - if ((ref->scheme =3D=3D NULL) && (ref->path =3D=3D NULL) && - ((ref->authority =3D=3D NULL) && (ref->server =3D=3D NULL))) { - res->scheme =3D g_strdup(bas->scheme); - if (bas->authority !=3D NULL) { - res->authority =3D g_strdup(bas->authority); - } else if (bas->server !=3D NULL) { - res->server =3D g_strdup(bas->server); - res->user =3D g_strdup(bas->user); - res->port =3D bas->port; - } - res->path =3D g_strdup(bas->path); - if (ref->query !=3D NULL) { - res->query =3D g_strdup(ref->query); - } else { - res->query =3D g_strdup(bas->query); - } - res->fragment =3D g_strdup(ref->fragment); - goto step_7; - } - - /* - * 3) If the scheme component is defined, indicating that the reference - * starts with a scheme name, then the reference is interpreted as = an - * absolute URI and we are done. Otherwise, the reference URI's - * scheme is inherited from the base URI's scheme component. - */ - if (ref->scheme !=3D NULL) { - val =3D uri_to_string(ref); - goto done; - } - res->scheme =3D g_strdup(bas->scheme); - - res->query =3D g_strdup(ref->query); - res->fragment =3D g_strdup(ref->fragment); - - /* - * 4) If the authority component is defined, then the reference is a - * network-path and we skip to step 7. Otherwise, the reference - * URI's authority is inherited from the base URI's authority - * component, which will also be undefined if the URI scheme does n= ot - * use an authority component. - */ - if ((ref->authority !=3D NULL) || (ref->server !=3D NULL)) { - if (ref->authority !=3D NULL) { - res->authority =3D g_strdup(ref->authority); - } else { - res->server =3D g_strdup(ref->server); - res->user =3D g_strdup(ref->user); - res->port =3D ref->port; - } - res->path =3D g_strdup(ref->path); - goto step_7; - } - if (bas->authority !=3D NULL) { - res->authority =3D g_strdup(bas->authority); - } else if (bas->server !=3D NULL) { - res->server =3D g_strdup(bas->server); - res->user =3D g_strdup(bas->user); - res->port =3D bas->port; - } - - /* - * 5) If the path component begins with a slash character ("/"), then - * the reference is an absolute-path and we skip to step 7. - */ - if ((ref->path !=3D NULL) && (ref->path[0] =3D=3D '/')) { - res->path =3D g_strdup(ref->path); - goto step_7; - } - - /* - * 6) If this step is reached, then we are resolving a relative-path - * reference. The relative path needs to be merged with the base - * URI's path. Although there are many ways to do this, we will - * describe a simple method using a separate string buffer. - * - * Allocate a buffer large enough for the result string. - */ - len =3D 2; /* extra / and 0 */ - if (ref->path !=3D NULL) { - len +=3D strlen(ref->path); - } - if (bas->path !=3D NULL) { - len +=3D strlen(bas->path); - } - res->path =3D g_malloc(len); - res->path[0] =3D 0; - - /* - * a) All but the last segment of the base URI's path component is - * copied to the buffer. In other words, any characters after the - * last (right-most) slash character, if any, are excluded. - */ - cur =3D 0; - out =3D 0; - if (bas->path !=3D NULL) { - while (bas->path[cur] !=3D 0) { - while ((bas->path[cur] !=3D 0) && (bas->path[cur] !=3D '/')) { - cur++; - } - if (bas->path[cur] =3D=3D 0) { - break; - } - - cur++; - while (out < cur) { - res->path[out] =3D bas->path[out]; - out++; - } - } - } - res->path[out] =3D 0; - - /* - * b) The reference's path component is appended to the buffer - * string. - */ - if (ref->path !=3D NULL && ref->path[0] !=3D 0) { - indx =3D 0; - /* - * Ensure the path includes a '/' - */ - if ((out =3D=3D 0) && (bas->server !=3D NULL)) { - res->path[out++] =3D '/'; - } - while (ref->path[indx] !=3D 0) { - res->path[out++] =3D ref->path[indx++]; - } - } - res->path[out] =3D 0; - - /* - * Steps c) to h) are really path normalization steps - */ - normalize_uri_path(res->path); - -step_7: - - /* - * 7) The resulting URI components, including any inherited from the - * base URI, are recombined to give the absolute form of the URI - * reference. - */ - val =3D uri_to_string(res); - -done: - uri_free(ref); - uri_free(bas); - uri_free(res); - return val; -} - -/** - * uri_resolve_relative: - * @URI: the URI reference under consideration - * @base: the base value - * - * Expresses the URI of the reference in terms relative to the - * base. Some examples of this operation include: - * base =3D "http://site1.com/docs/book1.html" - * URI input URI returned - * docs/pic1.gif pic1.gif - * docs/img/pic1.gif img/pic1.gif - * img/pic1.gif ../img/pic1.gif - * http://site1.com/docs/pic1.gif pic1.gif - * http://site2.com/docs/pic1.gif http://site2.com/docs/pic1.gif - * - * base =3D "docs/book1.html" - * URI input URI returned - * docs/pic1.gif pic1.gif - * docs/img/pic1.gif img/pic1.gif - * img/pic1.gif ../img/pic1.gif - * http://site1.com/docs/pic1.gif http://site1.com/docs/pic1.gif - * - * - * Note: if the URI reference is really weird or complicated, it may be - * worthwhile to first convert it into a "nice" one by calling - * uri_resolve (using 'base') before calling this routine, - * since this routine (for reasonable efficiency) assumes URI has - * already been through some validation. - * - * Returns a new URI string (to be freed by the caller) or NULL in case - * error. - */ -char *uri_resolve_relative(const char *uri, const char *base) -{ - char *val =3D NULL; - int ret; - int ix; - int pos =3D 0; - int nbslash =3D 0; - int len; - URI *ref =3D NULL; - URI *bas =3D NULL; - char *bptr, *uptr, *vptr; - int remove_path =3D 0; - - if ((uri =3D=3D NULL) || (*uri =3D=3D 0)) { - return NULL; - } - - /* - * First parse URI into a standard form - */ - ref =3D uri_new(); - /* If URI not already in "relative" form */ - if (uri[0] !=3D '.') { - ret =3D uri_parse_into(ref, uri); - if (ret !=3D 0) { - goto done; /* Error in URI, return NULL */ - } - } else { - ref->path =3D g_strdup(uri); - } - - /* - * Next parse base into the same standard form - */ - if ((base =3D=3D NULL) || (*base =3D=3D 0)) { - val =3D g_strdup(uri); - goto done; - } - bas =3D uri_new(); - if (base[0] !=3D '.') { - ret =3D uri_parse_into(bas, base); - if (ret !=3D 0) { - goto done; /* Error in base, return NULL */ - } - } else { - bas->path =3D g_strdup(base); - } - - /* - * If the scheme / server on the URI differs from the base, - * just return the URI - */ - if ((ref->scheme !=3D NULL) && - ((bas->scheme =3D=3D NULL) || (strcmp(bas->scheme, ref->scheme)) || - (strcmp(bas->server, ref->server)))) { - val =3D g_strdup(uri); - goto done; - } - if (bas->path =3D=3D ref->path || - (bas->path && ref->path && !strcmp(bas->path, ref->path))) { - val =3D g_strdup(""); - goto done; - } - if (bas->path =3D=3D NULL) { - val =3D g_strdup(ref->path); - goto done; - } - if (ref->path =3D=3D NULL) { - ref->path =3D (char *)"/"; - remove_path =3D 1; - } - - /* - * At this point (at last!) we can compare the two paths - * - * First we take care of the special case where either of the - * two path components may be missing (bug 316224) - */ - if (bas->path =3D=3D NULL) { - if (ref->path !=3D NULL) { - uptr =3D ref->path; - if (*uptr =3D=3D '/') { - uptr++; - } - /* exception characters from uri_to_string */ - val =3D uri_string_escape(uptr, "/;&=3D+$,"); - } - goto done; - } - bptr =3D bas->path; - if (ref->path =3D=3D NULL) { - for (ix =3D 0; bptr[ix] !=3D 0; ix++) { - if (bptr[ix] =3D=3D '/') { - nbslash++; - } - } - uptr =3D NULL; - len =3D 1; /* this is for a string terminator only */ - } else { - /* - * Next we compare the two strings and find where they first differ - */ - if ((ref->path[pos] =3D=3D '.') && (ref->path[pos + 1] =3D=3D '/')= ) { - pos +=3D 2; - } - if ((*bptr =3D=3D '.') && (bptr[1] =3D=3D '/')) { - bptr +=3D 2; - } else if ((*bptr =3D=3D '/') && (ref->path[pos] !=3D '/')) { - bptr++; - } - while ((bptr[pos] =3D=3D ref->path[pos]) && (bptr[pos] !=3D 0)) { - pos++; - } - - if (bptr[pos] =3D=3D ref->path[pos]) { - val =3D g_strdup(""); - goto done; /* (I can't imagine why anyone would do this) */ - } - - /* - * In URI, "back up" to the last '/' encountered. This will be the - * beginning of the "unique" suffix of URI - */ - ix =3D pos; - if ((ref->path[ix] =3D=3D '/') && (ix > 0)) { - ix--; - } else if ((ref->path[ix] =3D=3D 0) && (ix > 1) - && (ref->path[ix - 1] =3D=3D '/')) { - ix -=3D 2; - } - for (; ix > 0; ix--) { - if (ref->path[ix] =3D=3D '/') { - break; - } - } - if (ix =3D=3D 0) { - uptr =3D ref->path; - } else { - ix++; - uptr =3D &ref->path[ix]; - } - - /* - * In base, count the number of '/' from the differing point - */ - if (bptr[pos] !=3D ref->path[pos]) { /* check for trivial URI =3D= =3D base */ - for (; bptr[ix] !=3D 0; ix++) { - if (bptr[ix] =3D=3D '/') { - nbslash++; - } - } - } - len =3D strlen(uptr) + 1; - } - - if (nbslash =3D=3D 0) { - if (uptr !=3D NULL) { - /* exception characters from uri_to_string */ - val =3D uri_string_escape(uptr, "/;&=3D+$,"); - } - goto done; - } - - /* - * Allocate just enough space for the returned string - - * length of the remainder of the URI, plus enough space - * for the "../" groups, plus one for the terminator - */ - val =3D g_malloc(len + 3 * nbslash); - vptr =3D val; - /* - * Put in as many "../" as needed - */ - for (; nbslash > 0; nbslash--) { - *vptr++ =3D '.'; - *vptr++ =3D '.'; - *vptr++ =3D '/'; - } - /* - * Finish up with the end of the URI - */ - if (uptr !=3D NULL) { - if ((vptr > val) && (len > 0) && (uptr[0] =3D=3D '/') && - (vptr[-1] =3D=3D '/')) { - memcpy(vptr, uptr + 1, len - 1); - vptr[len - 2] =3D 0; - } else { - memcpy(vptr, uptr, len); - vptr[len - 1] =3D 0; - } - } else { - vptr[len - 1] =3D 0; - } - - /* escape the freshly-built path */ - vptr =3D val; - /* exception characters from uri_to_string */ - val =3D uri_string_escape(vptr, "/;&=3D+$,"); - g_free(vptr); - -done: - /* - * Free the working variables - */ - if (remove_path !=3D 0) { - ref->path =3D NULL; - } - uri_free(ref); - uri_free(bas); - - return val; -} - /* * Utility functions to help parse and assemble query strings. */ --=20 2.43.0