diff options
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2024-07-13 21:08:20 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-07-13 16:23:36 -0700 |
| commit | 193eda7507d0ccb2fe6fd42b403c56ecc205e546 (patch) | |
| tree | 78c49fc2f26f9fe7f04bf84222c0aa36b3d60af6 /compat/win32/path-utils.h | |
| parent | strvec: declare the `strvec_push_nodup()` function globally (diff) | |
| download | git-193eda7507d0ccb2fe6fd42b403c56ecc205e546.tar.gz git-193eda7507d0ccb2fe6fd42b403c56ecc205e546.zip | |
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 <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'compat/win32/path-utils.h')
| -rw-r--r-- | compat/win32/path-utils.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/compat/win32/path-utils.h b/compat/win32/path-utils.h index 65fa3b9263..a561c700e7 100644 --- a/compat/win32/path-utils.h +++ b/compat/win32/path-utils.h @@ -29,5 +29,9 @@ static inline int win32_has_dir_sep(const char *path) #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 +int win32_fspathcmp(const char *a, const char *b); +#define fspathcmp win32_fspathcmp +int win32_fspathncmp(const char *a, const char *b, size_t count); +#define fspathncmp win32_fspathncmp #endif |
