Re: [PATCH 2/4] rev-parse: make --git-dir return /.git instead of //.git
- From
Johannes Sixt <j6t@kdbg.org>
- Date
- Feb 9, 2010, 19:18 UTC
- Message-ID
- <201002092018.55951.j6t@kdbg.org>
- In-Reply-To
- <1265734950-15145-2-git-send-email-pclouds@gmail.com>
On Dienstag, 9. Februar 2010, Nguyễn Thái Ngọc Duy wrote:
Show 6 quoted lines
> @@ -647,7 +647,7 @@ int cmd_rev_parse(int argc, const char **argv, const
> char *prefix) }
> if (!getcwd(cwd, PATH_MAX))
> die_errno("unable to get current working directory");
> - printf("%s/.git\n", cwd);
> + printf("%s%s.git\n", cwd, *cwd == '/' && cwd[1] == '\0' ? "" : "/");On Windows, when you are in the root of a drive, then cwd is "C:/", i.e. there is a trailing slash just as in the Unix root directory. But you do not take care of this situation. That is, you would print "C://".
How about:
static inline int is_root_path(const char *path)
{
if (has_dos_drive_prefix(path))
path += 2;
while (is_dir_sep(*path))
path++;
return !*path;
}and use it though-out your series?
(Simplify the loop to 'return is_dir_sep(*path) && !path[1];' if you can assume that paths are nomalized.)
-- Hannes