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 1D1D237E316 for ; Mon, 12 Jan 2026 18:54:43 +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=1768244085; cv=pass; b=NNqhVbltF1U5JqQlsJSshq7p5TNpYL+lC8jNtRKdBO5yyWO2JmblqAd6DC6WmXuWMGDmP71JSBjD34S8nun274bQqRcfzeS6bQ/k2FbO/KGPJlHk/+3511xbIiT8PriGRsizwHeGxvf5SqdleRJOLQkd0DDpOb6PjvT8JhDCkZ0= ARC-Message-Signature:i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768244085; c=relaxed/simple; bh=9fqHjGDG/1AqSlpqnwz76Ad2QluA8WbpTdTsMPdf0Q4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=fbGK91ITt/6E9oluDWyPz3el27gb32CgAj5ecmdiuUbNNlWbIeF7EQ/78+DXYScl8VKnL4uXolCW9zG6XWlbS0cjoaarYG8Vfg9jHBWyJAn0jJHdDfudfuCz+giwdyc3Ku+IECG+L/olNKtzURWazMcrWs6+HhyJ3cwNIoqpgvs= 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=gIMdobDx; 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="gIMdobDx" ARC-Seal: i=1; a=rsa-sha256; t=1768244070; cv=none; d=zohomail.com; s=zohoarc; b=Yc4NncB2BwE3Ljrl0jmiYVBPNzsOsMZ/fghExX3vxJIxoY+Mn7mYVqQGYesKeuR7/TvFEnKEofdqnwVROxdp+5BykP1lkeA0fKGYyneBGdKV6KwOia9XkJHwjDyZHJaiA4tyaagXD69ypq8LIUp1QJuQYkDQyY+yK3IMR2C4Tz4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1768244070; 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=bqC1rmYZFywgQhLxkLkiJ0gAcY3sSCXUFq+r32vbEWI=; b=XgEVXIp2FPfns8j5mB9YxIhItEEkjr2XI8QL3u0sdJ9oXrTsN4y9t5lcKD2dDq6X9+4jFLXLS7OTWY93S5JQlVnHlRxpWBBp3DKVWR4MkzIo+S3Ot9Fk8g+z1W2z1INyoJEaNT0NOG6jtOXuXlZc7WQOjQ+ZPUL/Q6i0Q8ZsGkU= 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=1768244070; 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=bqC1rmYZFywgQhLxkLkiJ0gAcY3sSCXUFq+r32vbEWI=; b=gIMdobDxrS54QSa7mpuBKSOObp3pHobmhlC39K1IhmS4zJZqzyMClPewNBAo47tx QdMSW+eJFTer7HyFFK2xVt6SfokDXIVLLIR85ZCdXjCsDU4n4yzq60wHZ3HdWjm6c0e IF/PCCtVqwJoJWQDweJACau8fLVyr82rugpPffQM= Received: by mx.zohomail.com with SMTPS id 1768244068430428.0191915162321; Mon, 12 Jan 2026 10:54:28 -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 v9 07/11] builtin/credential-store: move is_rfc3986_unreserved to url.[ch] Date: Mon, 12 Jan 2026 20:46:28 +0200 Message-ID: <20260112184632.1334495-8-adrian.ratiu@collabora.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260112184632.1334495-1-adrian.ratiu@collabora.com> References: <20250816213642.3517822-1-adrian.ratiu@collabora.com> <20260112184632.1334495-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.52.0