[PATCH v2 5/5] trim_last_path_component(): avoid hard-coding the directory separator
- From
Karsten Blees via GitGitGadget <gitgitgadget@gmail.com>
- Date
- Jan 9, 2026, 20:05 UTC
- Message-ID
- <9823cbb6df84eedfa40d7120d3949f70d2f960ba.1767989109.git.gitgitgadget@gmail.com>
- In-Reply-To
- <pull.2017.v2.git.1767989109.gitgitgadget@gmail.com>
From: Karsten Blees <karsten.blees@gmail.com>
Currently, this function hard-codes the directory separator as the forward slash.
However, on Windows the backslash character is valid, too. And we want to call this function in the upcoming support for symlinks on Windows with the symlink targets (which naturally use the canonical directory separator on Windows, which is _not_ the forward slash).
Prepare that function to be useful also in that context.
Signed-off-by: Karsten Blees <karsten.blees@gmail.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> --- lockfile.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/lockfile.c b/lockfile.c index 1d5ed01682..67082a9caa 100644 --- a/lockfile.c +++ b/lockfile.c @@ -19,14 +19,14 @@ static void trim_last_path_component(struct strbuf *path) int i = path->len; /* back up past trailing slashes, if any */ - while (i && path->buf[i - 1] == '/') + while (i && is_dir_sep(path->buf[i - 1])) i--; /* * then go backwards until a slash, or the beginning of the * string */ - while (i && path->buf[i - 1] != '/') + while (i && !is_dir_sep(path->buf[i - 1])) i--; strbuf_setlen(path, i);
-- gitgitgadget