Merge branch 'hv/mingw-fs-funnies'
* hv/mingw-fs-funnies: mingw_rmdir: set errno=ENOTEMPTY when appropriate mingw: add fallback for rmdir in case directory is in use mingw: make failures to unlink or move raise a question mingw: work around irregular failures of unlink on windows mingw: move unlink wrapper to mingw.c
This commit is contained in:
@ -119,14 +119,6 @@ static inline int mingw_mkdir(const char *path, int mode)
|
||||
}
|
||||
#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
|
||||
pid_t waitpid(pid_t pid, int *status, unsigned options);
|
||||
|
||||
@ -174,6 +166,12 @@ int link(const char *oldpath, const char *newpath);
|
||||
* replacements of existing functions
|
||||
*/
|
||||
|
||||
int mingw_unlink(const char *pathname);
|
||||
#define unlink mingw_unlink
|
||||
|
||||
int mingw_rmdir(const char *path);
|
||||
#define rmdir mingw_rmdir
|
||||
|
||||
int mingw_open (const char *filename, int oflags, ...);
|
||||
#define open mingw_open
|
||||
|
||||
|
Reference in New Issue
Block a user