Browse Source

Windows: Work around misbehaved rename().

Windows's rename() is based on the MoveFile() API, which fails if the
destination exists. Here we work around the problem by using MoveFileEx().
Furthermore, the posixly correct error is returned if the destination is
a directory.

The implementation is still slightly incomplete, however, because of the
missing error code translation: We assume that the failure is due to
permissions.

Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
maint
Johannes Sixt 17 years ago
parent
commit
ea9e98c3a5
  1. 25
      compat/mingw.c
  2. 3
      compat/mingw.h

25
compat/mingw.c

@ -73,6 +73,31 @@ char *mingw_getcwd(char *pointer, int len) @@ -73,6 +73,31 @@ char *mingw_getcwd(char *pointer, int len)
return ret;
}

#undef rename
int mingw_rename(const char *pold, const char *pnew)
{
/*
* Try native rename() first to get errno right.
* It is based on MoveFile(), which cannot overwrite existing files.
*/
if (!rename(pold, pnew))
return 0;
if (errno != EEXIST)
return -1;
if (MoveFileEx(pold, pnew, MOVEFILE_REPLACE_EXISTING))
return 0;
/* TODO: translate more errors */
if (GetLastError() == ERROR_ACCESS_DENIED) {
DWORD attrs = GetFileAttributes(pnew);
if (attrs != INVALID_FILE_ATTRIBUTES && (attrs & FILE_ATTRIBUTE_DIRECTORY)) {
errno = EISDIR;
return -1;
}
}
errno = EACCES;
return -1;
}

struct passwd *getpwuid(int uid)
{
static char user_name[100];

3
compat/mingw.h

@ -151,6 +151,9 @@ int mingw_open (const char *filename, int oflags, ...); @@ -151,6 +151,9 @@ int mingw_open (const char *filename, int oflags, ...);
char *mingw_getcwd(char *pointer, int len);
#define getcwd mingw_getcwd

int mingw_rename(const char*, const char*);
#define rename mingw_rename

/*
* git specific compatibility
*/

Loading…
Cancel
Save