From 193eda7507d0ccb2fe6fd42b403c56ecc205e546 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Sat, 13 Jul 2024 21:08:20 +0000 Subject: win32: override `fspathcmp()` with a directory separator-aware version On Windows, the backslash is the directory separator, even if the forward slash can be used, too, at least since Windows NT. This means that the paths `a/b` and `a\b` are equivalent, and `fspathcmp()` needs to be made aware of that fact. Note that we have to override both `fspathcmp()` and `fspathncmp()`, and the former cannot be a mere pre-processor constant that transforms calls to `fspathcmp(a, b)` into `fspathncmp(a, b, (size_t)-1)` because the function `report_collided_checkout()` in `unpack-trees.c` wants to assign `list.cmp = fspathcmp`. Also note that `fspatheq()` does _not_ need to be overridden because it calls `fspathcmp()` internally. Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano --- dir.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'dir.h') diff --git a/dir.h b/dir.h index 69a76d8bdd..a3a2f00f5d 100644 --- a/dir.h +++ b/dir.h @@ -541,9 +541,9 @@ int remove_dir_recursively(struct strbuf *path, int flag); */ int remove_path(const char *path); -int fspathcmp(const char *a, const char *b); +int git_fspathcmp(const char *a, const char *b); int fspatheq(const char *a, const char *b); -int fspathncmp(const char *a, const char *b, size_t count); +int git_fspathncmp(const char *a, const char *b, size_t count); unsigned int fspathhash(const char *str); /* -- cgit v1.3-6-g1900