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

Make checkDirectoryDB check that the db file is a regular file

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

19
src/directory.c
View File

@ -1021,6 +1021,7 @@ static void sortDirectory(Directory * directory)
int checkDirectoryDB() int checkDirectoryDB()
{ {
struct stat st;
char *dbFile; char *dbFile;
char *dirPath; char *dirPath;
char *dbPath; char *dbPath;
@ -1029,11 +1030,10 @@ int checkDirectoryDB()
/* Check if the file exists */ /* Check if the file exists */
if (access(dbFile, F_OK)) { if (access(dbFile, F_OK)) {
dbPath = strdup(dbFile);
/* If the file doesn't exist, we can't check if we can write /* 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 * it, so we are going to try to get the directory path, and
* see if we can write a file in that */ * see if we can write a file in that */
dbPath = strdup(dbFile);
dirPath = dirname(dbPath); dirPath = dirname(dbPath);
/* Check if we can write to the directory */ /* Check if we can write to the directory */
@ -1049,7 +1049,19 @@ int checkDirectoryDB()
return 0; return 0;
} }
/* File exists, now check if we can write it */ /* Path exists, now check if it's a regular file */
if (stat(dbFile, &st) < 0) {
ERROR("Error stat'ing db file \"%s\": %s\n", dbFile,
strerror(errno));
return -1;
}
if (!S_ISREG(st.st_mode)) {
ERROR("db file \"%s\" is not a regular file\n", dbFile);
return -1;
}
/* And check that we can write to it */
if (access(dbFile, R_OK | W_OK)) { if (access(dbFile, R_OK | W_OK)) {
ERROR("Can't open db file \"%s\" for reading/writing: %s\n", ERROR("Can't open db file \"%s\" for reading/writing: %s\n",
dbFile, strerror(errno)); dbFile, strerror(errno));
@ -1172,6 +1184,7 @@ int readDirectoryDB()
ERROR("db info not found in db file\n"); ERROR("db info not found in db file\n");
ERROR("you should recreate the db using --create-db\n"); ERROR("you should recreate the db using --create-db\n");
fseek(fp, 0, SEEK_SET); fseek(fp, 0, SEEK_SET);
return -1;
} }
} }