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

state_file: errors are non-fatal in read_state_file()

Browse Source 
If the state file cannot be read, for whatever reason, don't abort
MPD.  The state file isn't _that_ important.
This commit is contained in:
Max Kellermann
2009-01-03 14:53:23 +01:00
parent 2064e8ac4c
commit dcff29e5aa
4 changed files with 24 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/playlist.c
View File

@@ -30,7 +30,6 @@
#include "log.h"
#include "mapper.h"
#include "path.h"
#include "state_file.h"
#include "stored_playlist.h"
#include "ack.h"
#include "idle.h"
@@ -279,17 +278,26 @@ static void loadPlaylistFromStateFile(FILE *fp, char *buffer,
char *temp;
int song;
if (!fgets(buffer, PLAYLIST_BUFFER_SIZE, fp))
state_file_fatal();
if (!fgets(buffer, PLAYLIST_BUFFER_SIZE, fp)) {
g_warning("No playlist in state file");
return;
}
while (!g_str_has_prefix(buffer, PLAYLIST_STATE_FILE_PLAYLIST_END)) {
g_strchomp(buffer);
temp = strtok(buffer, ":");
if (temp == NULL)
state_file_fatal();
if (temp == NULL) {
g_warning("Malformed playlist line in state file");
break;
}
song = atoi(temp);
if (!(temp = strtok(NULL, "")))
state_file_fatal();
if (!(temp = strtok(NULL, ""))) {
g_warning("Malformed playlist line in state file");
break;
}
if (addToPlaylist(temp, NULL) == PLAYLIST_RESULT_SUCCESS
&& current == song) {
if (state != PLAYER_STATE_STOP) {
@@ -304,8 +312,11 @@ static void loadPlaylistFromStateFile(FILE *fp, char *buffer,
}
}
if (!fgets(buffer, PLAYLIST_BUFFER_SIZE, fp))
state_file_fatal();
if (!fgets(buffer, PLAYLIST_BUFFER_SIZE, fp)) {
g_warning("'%s' not found in state file",
PLAYLIST_STATE_FILE_PLAYLIST_END);
break;
}
}
}
@@ -357,9 +368,6 @@ void readPlaylistState(FILE *fp)
} else
setPlaylistRandomStatus(false);
} else if (g_str_has_prefix(buffer, PLAYLIST_STATE_FILE_CURRENT)) {
if (strlen(buffer) ==
strlen(PLAYLIST_STATE_FILE_CURRENT))
state_file_fatal();
current = atoi(&(buffer
[strlen
(PLAYLIST_STATE_FILE_CURRENT)]));