proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-06-28 21:57:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Clone: non-empty-dir test, now for Win32.

Browse Source
This commit is contained in:
Ben Straub 2012-06-21 20:07:32 -07:00
parent acdd3d959b
commit 830388a728
1 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/clone.c
View File

@ -6,7 +6,10 @@
*/ */
#include <assert.h> #include <assert.h>
#ifndef GIT_WIN32
#include <dirent.h> #include <dirent.h>
#endif
#include "git2/clone.h" #include "git2/clone.h"
#include "git2/remote.h" #include "git2/remote.h"
@ -184,8 +187,15 @@ static bool is_dot_or_dotdot(const char *name)
/* TODO: p_opendir, p_closedir */ /* TODO: p_opendir, p_closedir */
static bool path_is_okay(const char *path) static bool path_is_okay(const char *path)
{ {
DIR *dir; #ifdef GIT_WIN32
HANDLE hFind = INVALID_HANDLE_VALUE;
wchar_t *wbuf;
WIN32_FIND_DATAW ffd;
#else
DIR *dir = NULL;
struct dirent *e; struct dirent *e;
#endif
bool retval = true; bool retval = true;
/* The path must either not exist, or be an empty directory */ /* The path must either not exist, or be an empty directory */
@ -197,6 +207,16 @@ static bool path_is_okay(const char *path)
return false; return false;
} }
#ifdef GIT_WIN32
wbuf = gitwin_to_utf16(path);
gitwin_append_utf16(wbuf, "\\*", 2);
hFind = FindFirstFileW(wbuf, &ffd);
if (INVALID_HANDLE_VALUE != hFind) {
retval = false;
FindClose(hFind);
}
git__free(wbuf);
#else
dir = opendir(path); dir = opendir(path);
if (!dir) { if (!dir) {
giterr_set(GITERR_OS, "Couldn't open '%s'", path); giterr_set(GITERR_OS, "Couldn't open '%s'", path);
@ -211,8 +231,9 @@ static bool path_is_okay(const char *path)
break; break;
} }
} }
closedir(dir); closedir(dir);
#endif
return retval; return retval;
} }