9fd512c8d6
Add a path_match_flags() function and have the two sets of
starts_with_dot_{,dot_}slash() functions added in
63e95beb08 (submodule: port resolve_relative_url from shell to C,
2016-04-15) and a2b26ffb1a (fsck: convert gitmodules url to URL
passed to curl, 2020-04-18) be thin wrappers for it.
As the latter of those notes the fsck version was copied from the
initial builtin/submodule--helper.c version.
Since the code added in a2b26ffb1a was doing really doing the same as
win32_is_dir_sep() added in 1cadad6f65 (git clone <url>
C:\cygwin\home\USER\repo' is working (again), 2018-12-15) let's move
the latter to git-compat-util.h is a is_xplatform_dir_sep(). We can
then call either it or the platform-specific is_dir_sep() from this
new function.
Let's likewise change code in various other places that was hardcoding
checks for "'/' || '\\'" with the new is_xplatform_dir_sep(). As can
be seen in those callers some of them still concern themselves with
':' (Mac OS classic?), but let's leave the question of whether that
should be consolidated for some other time.
As we expect to make wider use of the "native" case in the future,
define and use two starts_with_dot_{,dot_}slash_native() convenience
wrappers. This makes the diff in builtin/submodule--helper.c much
smaller.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Derrick Stolee <derrickstolee@github.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
34 lines
1020 B
C
34 lines
1020 B
C
#ifndef WIN32_PATH_UTILS_H
|
|
#define WIN32_PATH_UTILS_H
|
|
|
|
int win32_has_dos_drive_prefix(const char *path);
|
|
#define has_dos_drive_prefix win32_has_dos_drive_prefix
|
|
|
|
int win32_skip_dos_drive_prefix(char **path);
|
|
#define skip_dos_drive_prefix win32_skip_dos_drive_prefix
|
|
#define is_dir_sep is_xplatform_dir_sep
|
|
static inline char *win32_find_last_dir_sep(const char *path)
|
|
{
|
|
char *ret = NULL;
|
|
for (; *path; ++path)
|
|
if (is_dir_sep(*path))
|
|
ret = (char *)path;
|
|
return ret;
|
|
}
|
|
#define find_last_dir_sep win32_find_last_dir_sep
|
|
static inline int win32_has_dir_sep(const char *path)
|
|
{
|
|
/*
|
|
* See how long the non-separator part of the given path is, and
|
|
* if and only if it covers the whole path (i.e. path[len] is NUL),
|
|
* there is no separator in the path---otherwise there is a separator.
|
|
*/
|
|
size_t len = strcspn(path, "/\\");
|
|
return !!path[len];
|
|
}
|
|
#define has_dir_sep(path) win32_has_dir_sep(path)
|
|
int win32_offset_1st_component(const char *path);
|
|
#define offset_1st_component win32_offset_1st_component
|
|
|
|
#endif
|