summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVicent Martí <tanoku@gmail.com>2012-04-20 11:24:03 -0700
committerVicent Martí <tanoku@gmail.com>2012-04-20 11:24:03 -0700
commite8dc508f6af672c04fc4245c523d1dd67b135470 (patch)
tree5bd79f3bc355dda1b1d81633c1b7c1043f4d2e3f
parent31e80290a1a08a24780a0cbedd3a400fccd80a8b (diff)
parenteb6db16d8267b0e62a50627dd7b6cfae472d8610 (diff)
downloadlibgit2-e8dc508f6af672c04fc4245c523d1dd67b135470.tar.gz
Merge pull request #635 from csware/win32-utf8
GetFileAttributes does not work for utf-8 encoded paths
-rw-r--r--src/path.c10
1 files changed, 1 insertions, 9 deletions
diff --git a/src/path.c b/src/path.c
index d2c292bf2..2e6a1eb40 100644
--- a/src/path.c
+++ b/src/path.c
@@ -9,6 +9,7 @@
#include "posix.h"
#ifdef GIT_WIN32
#include "win32/dir.h"
+#include "win32/posix.h"
#else
#include <dirent.h>
#endif
@@ -362,20 +363,11 @@ int git_path_exists(const char *path)
int git_path_isdir(const char *path)
{
-#ifdef GIT_WIN32
- DWORD attr = GetFileAttributes(path);
- if (attr == INVALID_FILE_ATTRIBUTES)
- return GIT_ERROR;
-
- return (attr & FILE_ATTRIBUTE_DIRECTORY) ? GIT_SUCCESS : GIT_ERROR;
-
-#else
struct stat st;
if (p_stat(path, &st) < GIT_SUCCESS)
return GIT_ERROR;
return S_ISDIR(st.st_mode) ? GIT_SUCCESS : GIT_ERROR;
-#endif
}
int git_path_isfile(const char *path)