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

If we're going to create the db file, make sure the parent path is a directory

Browse Source 
git-svn-id: https://svn.musicpd.org/mpd/trunk@4437 09075e82-0dd4-0310-85a5-a0d7c8717e4f
This commit is contained in:
J. Alexander Treuman 2006-07-23 23:42:16 +00:00
parent c3bc1e5b3c
commit 76528555dc
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/directory.c
View File

@ -1036,6 +1036,21 @@ int checkDirectoryDB()
dbPath = strdup(dbFile); dbPath = strdup(dbFile);
dirPath = dirname(dbPath); dirPath = dirname(dbPath);
/* Check that the parent part of the path is a directory */
if (stat(dirPath, &st) < 0) {
ERROR("Couldn't stat parent directory of db file "
"\"%s\": %s\n", dbFile, strerror(errno));
free(dbPath);
return -1;
}
if (!S_ISDIR(st.st_mode)) {
ERROR("Couldn't create db file \"%s\" because the "
"parent path is not a directory\n", dbFile);
free(dbPath);
return -1;
}
/* Check if we can write to the directory */ /* Check if we can write to the directory */
if (access(dirPath, R_OK | W_OK)) { if (access(dirPath, R_OK | W_OK)) {
ERROR("Can't create db file in \"%s\": %s\n", dirPath, ERROR("Can't create db file in \"%s\": %s\n", dirPath,
@ -1051,7 +1066,7 @@ int checkDirectoryDB()
/* Path exists, now check if it's a regular file */ /* Path exists, now check if it's a regular file */
if (stat(dbFile, &st) < 0) { if (stat(dbFile, &st) < 0) {
ERROR("Error stat'ing db file \"%s\": %s\n", dbFile, ERROR("Couldn't stat db file \"%s\": %s\n", dbFile,
strerror(errno)); strerror(errno));
return -1; return -1;
} }