Check that db_file exists before checking if we can write to it. Committed on behalf of qball.
git-svn-id: https://svn.musicpd.org/mpd/trunk@4255 09075e82-0dd4-0310-85a5-a0d7c8717e4f
This commit is contained in:
@@ -48,6 +48,7 @@
|
|||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
#include <signal.h>
|
#include <signal.h>
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
|
#include <libgen.h>
|
||||||
|
|
||||||
#define DIRECTORY_DIR "directory: "
|
#define DIRECTORY_DIR "directory: "
|
||||||
#define DIRECTORY_MTIME "mtime: "
|
#define DIRECTORY_MTIME "mtime: "
|
||||||
@@ -989,7 +990,36 @@ void sortDirectory(Directory * directory) {
|
|||||||
|
|
||||||
int checkDirectoryDB() {
|
int checkDirectoryDB() {
|
||||||
char * dbFile = getDbFile();
|
char * dbFile = getDbFile();
|
||||||
|
/**
|
||||||
|
* Check if the file exists
|
||||||
|
*/
|
||||||
|
if(access(dbFile, F_OK)) {
|
||||||
|
char *dirPath = NULL;
|
||||||
|
char *dbPath = strdup(dbFile);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* If the file doesn't exits, 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
|
||||||
|
*/
|
||||||
|
dirPath = dirname(dbPath);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Check if we can write to the directory
|
||||||
|
*/
|
||||||
|
if(access(dirPath, R_OK|W_OK))
|
||||||
|
{
|
||||||
|
ERROR("Can't create db file in \"%s\": %s", dirPath, strerror(errno));
|
||||||
|
free(dbPath);
|
||||||
|
return -1;
|
||||||
|
|
||||||
|
}
|
||||||
|
free(dbPath);
|
||||||
|
return 0;
|
||||||
|
|
||||||
|
}
|
||||||
|
/**
|
||||||
|
* File exists, now check if we can write it
|
||||||
|
*/
|
||||||
if(access(dbFile, R_OK|W_OK)) {
|
if(access(dbFile, R_OK|W_OK)) {
|
||||||
ERROR("db file \"%s\" cannot be opened for reading/writing: %s",
|
ERROR("db file \"%s\" cannot be opened for reading/writing: %s",
|
||||||
dbFile, strerror(errno));
|
dbFile, strerror(errno));
|
||||||
|
Reference in New Issue
Block a user