Commit 339f3d07 by Ben Straub

Move is_dot_or_dotdotW into path.h.

parent 81167385
...@@ -391,13 +391,6 @@ bool git_path_isfile(const char *path) ...@@ -391,13 +391,6 @@ bool git_path_isfile(const char *path)
#ifdef GIT_WIN32 #ifdef GIT_WIN32
static bool is_dot_or_dotdotW(const wchar_t *name)
{
return (name[0] == L'.' &&
(name[1] == L'\0' ||
(name[1] == L'.' && name[2] == L'\0')));
}
bool git_path_is_empty_dir(const char *path) bool git_path_is_empty_dir(const char *path)
{ {
git_buf pathbuf = GIT_BUF_INIT; git_buf pathbuf = GIT_BUF_INIT;
...@@ -418,7 +411,7 @@ bool git_path_is_empty_dir(const char *path) ...@@ -418,7 +411,7 @@ bool git_path_is_empty_dir(const char *path)
} }
do { do {
if (!is_dot_or_dotdotW(ffd.cFileName)) { if (!git_path_is_dot_or_dotdotW(ffd.cFileName)) {
retval = false; retval = false;
} }
} while (FindNextFileW(hFind, &ffd) != 0); } while (FindNextFileW(hFind, &ffd) != 0);
......
...@@ -91,6 +91,13 @@ GIT_INLINE(int) git_path_is_dot_or_dotdot(const char *name) ...@@ -91,6 +91,13 @@ GIT_INLINE(int) git_path_is_dot_or_dotdot(const char *name)
} }
#ifdef GIT_WIN32 #ifdef GIT_WIN32
GIT_INLINE(int) git_path_is_dot_or_dotdotW(const wchar_t *name)
{
return (name[0] == L'.' &&
(name[1] == L'\0' ||
(name[1] == L'.' && name[2] == L'\0')));
}
/** /**
* Convert backslashes in path to forward slashes. * Convert backslashes in path to forward slashes.
*/ */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment