From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from sender4-op-o12.zoho.com (sender4-op-o12.zoho.com [136.143.188.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 755983093D8 for ; Sat, 20 Dec 2025 10:16:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=pass smtp.client-ip=136.143.188.12 ARC-Seal:i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766225791; cv=pass; b=AmnHXynD7YJAUARzrvpEDgPlkyowUPskXBJo0mWbqrQN6G+exdrq6qPi+builIpH4Oln8MlR9mQswTUhgqRb2vL0/oD1m+FkjMzUSJg/2mqtqcUeQU7H4BK9slUyxIqJ7ZfUMpzZN+Z+6HZ0W/IhG938ccK1Zet2XpXzbBnKjLY= ARC-Message-Signature:i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766225791; c=relaxed/simple; bh=Dsp10BViORKUocAaol8JwCYHBjkMiWZMLR8mm+JeWEY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=CLZatvXkrNKMqLyFZhHmxYB0nu1ff9NBcd96k4BEvx/G0u4X+x2sB4B5UuO8Mk+Xe9IpVJ8/+UiDGH8CYKaqeg0Vn5bZ7kPL68Y0Cz3KsSPxSkrotraD9UaIQY7Vxy92idoK8ElZijRtf8hpAtJU/FN3SGR/Su7TNztIQHi9TJ4= ARC-Authentication-Results:i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass (1024-bit key) header.d=collabora.com header.i=adrian.ratiu@collabora.com header.b=AiD6S79r; arc=pass smtp.client-ip=136.143.188.12 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=collabora.com header.i=adrian.ratiu@collabora.com header.b="AiD6S79r" ARC-Seal: i=1; a=rsa-sha256; t=1766225775; cv=none; d=zohomail.com; s=zohoarc; b=QZ0iiq5MTI07QGfmNtQOeazGfr5KvX4cLH4pzikCrmb9BatjciK3Ptxvzjyt3HDrZbU5ZU49OBxftF2uym+o2gZeEgntW0pPvvLBpCSTExyAMp0iTxDAdwchJ6cP2eDXAiIY6tgmXMfJ9YYB+uupgFpORM0/0twf3nefa8dEoig= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1766225775; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:Subject:To:To:Message-Id:Reply-To; bh=6tL2I7roLPNU+zsghwkt1hlH4utinv4q5aG2Oe5MF+k=; b=ArHFHzaQ+um0Ve62AUBDc0NmIlepYbbj6jWGCmVUdsG1seaAZj5b0w0LYcCNVyd6IXzAjfLMHgZAoP9lOTAtcv2zMJ+cudq0ao8nv/ibiVEQvovOekks+8lIC10mMg3wog3TKU9Gh/OUHswTsC/D9HbFU6TS2loKGfI/uEDUBvY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=collabora.com; spf=pass smtp.mailfrom=adrian.ratiu@collabora.com; dmarc=pass header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1766225775; s=zohomail; d=collabora.com; i=adrian.ratiu@collabora.com; h=From:From:To:To:Cc:Cc:Subject:Subject:Date:Date:Message-ID:In-Reply-To:References:MIME-Version:Content-Transfer-Encoding:Message-Id:Reply-To; bh=6tL2I7roLPNU+zsghwkt1hlH4utinv4q5aG2Oe5MF+k=; b=AiD6S79r12y132FcI5Z3V6ue3mRMCg3wf0pfzZyDvCRsbrfJG+SqeN4v5/yUpeuR /Rsc4x3nCy+tkPKZlMVSBFsMXug9vCW5uBb1Ov7IZ0I7lA1jiYeKhPN8tY12wsb335x m/K4HBc1UP7PvSuLqc+CjymRgA6ATpHk3UyblqSU= Received: by mx.zohomail.com with SMTPS id 176622577428336.43148150518209; Sat, 20 Dec 2025 02:16:14 -0800 (PST) From: Adrian Ratiu To: git@vger.kernel.org Cc: Emily Shaffer , Rodrigo Damazio Bovendorp , Jeff King , Junio C Hamano , Aaron Schrab , Jonathan Nieder , Patrick Steinhardt , Josh Steadmon , Ben Knoble , Phillip Wood , Adrian Ratiu Subject: [PATCH v7 07/11] builtin/credential-store: move is_rfc3986_unreserved to url.[ch] Date: Sat, 20 Dec 2025 12:15:24 +0200 Message-ID: <20251220101528.1227487-8-adrian.ratiu@collabora.com> X-Mailer: git-send-email 2.51.2 In-Reply-To: <20251220101528.1227487-1-adrian.ratiu@collabora.com> References: <20250816213642.3517822-1-adrian.ratiu@collabora.com> <20251220101528.1227487-1-adrian.ratiu@collabora.com> Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-ZohoMailClient: External is_rfc3986_unreserved() was moved to credential-store.c and was made static by f89854362c (credential-store: move related functions to credential-store file, 2023-06-06) under a correct assumption, at the time, that it was the only place using it. However now we need it to apply URL-encoding to submodule names when constructing gitdir paths, to avoid conflicts, so bring it back as a public function exposed via url.h, instead of the old helper path (strbuf), which has nothing to do with 3986 encoding/decoding anymore. This function will be used in subsequent commits which do the encoding. Signed-off-by: Adrian Ratiu --- builtin/credential-store.c | 7 +------ url.c | 6 ++++++ url.h | 7 +++++++ 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/builtin/credential-store.c b/builtin/credential-store.c index b74e06cc93..bc1453c6b2 100644 --- a/builtin/credential-store.c +++ b/builtin/credential-store.c @@ -7,6 +7,7 @@ #include "path.h" #include "string-list.h" #include "parse-options.h" +#include "url.h" #include "write-or-die.h" static struct lock_file credential_lock; @@ -76,12 +77,6 @@ static void rewrite_credential_file(const char *fn, struct credential *c, die_errno("unable to write credential store"); } -static int is_rfc3986_unreserved(char ch) -{ - return isalnum(ch) || - ch == '-' || ch == '_' || ch == '.' || ch == '~'; -} - static int is_rfc3986_reserved_or_unreserved(char ch) { if (is_rfc3986_unreserved(ch)) diff --git a/url.c b/url.c index 282b12495a..adc289229c 100644 --- a/url.c +++ b/url.c @@ -3,6 +3,12 @@ #include "strbuf.h" #include "url.h" +int is_rfc3986_unreserved(char ch) +{ + return isalnum(ch) || + ch == '-' || ch == '_' || ch == '.' || ch == '~'; +} + int is_urlschemechar(int first_flag, int ch) { /* diff --git a/url.h b/url.h index 2a27c34277..e644c3c809 100644 --- a/url.h +++ b/url.h @@ -21,4 +21,11 @@ char *url_decode_parameter_value(const char **query); void end_url_with_slash(struct strbuf *buf, const char *url); void str_end_url_with_slash(const char *url, char **dest); +/* + * The set of unreserved characters as per STD66 (RFC3986) is + * '[A-Za-z0-9-._~]'. These characters are safe to appear in URI + * components without percent-encoding. + */ +int is_rfc3986_unreserved(char ch); + #endif /* URL_H */ -- 2.51.2