undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

verify_dotfile(): do not assume '/' is the path seperator

Browse Source 
verify_dotfile() currently assumes that the path seperator is '/', but on
Windows it can also be '\\', so use is_dir_sep() instead.

Signed-off-by: Theo Niessink <theo@taletn.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Theo Niessink 2011-06-08 14:04:41 +02:00 committed by Junio C Hamano
parent 3bdf09c7f5
commit e0f530ff8a
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
read-cache.c
View File

@ -747,11 +747,12 @@ static int verify_dotfile(const char *rest)
* has already been discarded, we now test
* the rest.
*/
switch (*rest) {
/* "." is not allowed */
case '\0': case '/':
if (*rest == '\0' || is_dir_sep(*rest))
return 0;
switch (*rest) {
/*
* ".git" followed by NUL or slash is bad. This
* shares the path end test with the ".." case.
@ -764,7 +765,7 @@ static int verify_dotfile(const char *rest)
rest += 2;
/* fallthrough */
case '.':
if (rest[1] == '\0' || rest[1] == '/')
if (rest[1] == '\0' || is_dir_sep(rest[1]))
return 0;
}
return 1;