db/pg_probackup
db/pg_probackup
1
0
Fork 0
mirror of https://github.com/postgrespro/pg_probackup.git synced 2025-01-05 13:20:31 +02:00
Code Issues Releases Activity

Fix remove dir under Windows

Browse Source
This commit is contained in:
Konstantin Knizhnik 2019-04-25 12:59:20 +03:00
parent 37ae88e9b2
commit e5c6bb477a
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/utils/file.c
View File

@ -58,6 +58,17 @@ static ssize_t pread(int fd, void* buf, size_t size, off_t off)
return -1;
return read(fd, buf, size);
}
static int remove_file_or_dir(char const* path)
{
int rc = remove(path);
#ifdef WIN32
if (rc < 0 && errno == EACCESS)
rc = rmdir(path);
#endif
return rc;
}
#else
#define remove_file_or_dir(path) remove(path)
#endif
/* Check if specified location is local for current node */
@ -715,7 +726,7 @@ int fio_unlink(char const* path, fio_location location)
}
else
{
return remove(path);
return remove_file_or_dir(path);
}
}
@ -1343,7 +1354,7 @@ void fio_communicate(int in, int out)
SYS_CHECK(symlink(buf, buf + strlen(buf) + 1));
break;
case FIO_UNLINK: /* Remove file or directory (TODO: Win32) */
SYS_CHECK(remove(buf));
SYS_CHECK(remove_file_or_dir(buf));
break;
case FIO_MKDIR: /* Create direcory */
hdr.size = 0;