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

mingw: move unlink wrapper to mingw.c

Browse Source 
The next patch implements a workaround in case unlink fails on Windows.

Signed-off-by: Heiko Voigt <hvoigt@hvoigt.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Heiko Voigt 2011-02-07 21:49:33 +01:00 committed by Junio C Hamano
parent b5c1781430
commit 337967fb77
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
compat/mingw.c
View File

@ -116,6 +116,14 @@ int err_win_to_posix(DWORD winerr)
return error; return error;
} }
#undef unlink
int mingw_unlink(const char *pathname)
{
/* read-only files cannot be removed */
chmod(pathname, 0666);
return unlink(pathname);
}
#undef open #undef open
int mingw_open (const char *filename, int oflags, ...) int mingw_open (const char *filename, int oflags, ...)
{ {

11
compat/mingw.h
View File

@ -125,14 +125,6 @@ static inline int mingw_mkdir(const char *path, int mode)
} }
#define mkdir mingw_mkdir #define mkdir mingw_mkdir
static inline int mingw_unlink(const char *pathname)
{
/* read-only files cannot be removed */
chmod(pathname, 0666);
return unlink(pathname);
}
#define unlink mingw_unlink
#define WNOHANG 1 #define WNOHANG 1
pid_t waitpid(pid_t pid, int *status, unsigned options); pid_t waitpid(pid_t pid, int *status, unsigned options);
@ -180,6 +172,9 @@ int link(const char *oldpath, const char *newpath);
* replacements of existing functions * replacements of existing functions
*/ */
int mingw_unlink(const char *pathname);
#define unlink mingw_unlink
int mingw_open (const char *filename, int oflags, ...); int mingw_open (const char *filename, int oflags, ...);
#define open mingw_open #define open mingw_open