mirror of
https://github.com/git/git.git
synced 2026-01-21 06:17:19 +09:00
builtin/credential-store: move is_rfc3986_unreserved to url.[ch]
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 <adrian.ratiu@collabora.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
e14349d58e
commit
226694bdf4
@ -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))
|
||||
|
||||
6
url.c
6
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)
|
||||
{
|
||||
/*
|
||||
|
||||
7
url.h
7
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 */
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user