oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

db/SimpleDatabasePlugin.cxx: don't use CheckAccess with mode on Windows

Browse Source
This commit is contained in:
Denis Krjuchkov 2013-12-05 14:41:43 +06:00
parent 06d7169674
commit c161bb287c
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/db/SimpleDatabasePlugin.cxx
View File

@ -71,7 +71,7 @@ SimpleDatabase::Check(Error &error) const
assert(!path.IsNull());
/* Check if the file exists */
if (!CheckAccess(path, F_OK)) {
if (!CheckAccess(path)) {
/* If the file doesn't exist, we can't check if we can write
* it, so we are going to try to get the directory path, and
* see if we can write a file in that */
@ -94,6 +94,7 @@ SimpleDatabase::Check(Error &error) const
return false;
}
#ifndef WIN32
/* Check if we can write to the directory */
if (!CheckAccess(dirPath, X_OK | W_OK)) {
const int e = errno;
@ -102,7 +103,7 @@ SimpleDatabase::Check(Error &error) const
dirPath_utf8.c_str());
return false;
}
#endif
return true;
}
@ -121,12 +122,14 @@ SimpleDatabase::Check(Error &error) const
return false;
}
#ifndef WIN32
/* And check that we can write to it */
if (!CheckAccess(path, R_OK | W_OK)) {
error.FormatErrno("Can't open db file \"%s\" for reading/writing",
path_utf8.c_str());
return false;
}
#endif
return true;
}