diff options
| -rw-r--r-- | src/storedPlaylist.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/storedPlaylist.c b/src/storedPlaylist.c index 69eb34807..c936d61f9 100644 --- a/src/storedPlaylist.c +++ b/src/storedPlaylist.c @@ -287,7 +287,7 @@ int appendSongToStoredPlaylistByPath(int fd, const char *utf8path, Song *song) { FILE *file; char *s; - int nr_songs = 0; + struct stat st; char path_max_tmp[MPD_PATH_MAX]; char path_max_tmp2[MPD_PATH_MAX]; @@ -295,18 +295,18 @@ int appendSongToStoredPlaylistByPath(int fd, const char *utf8path, Song *song) return -1; utf8_to_fs_playlist_path(path_max_tmp, utf8path); - while (!(file = fopen(path_max_tmp, "a+")) && errno == EINTR); + while (!(file = fopen(path_max_tmp, "a")) && errno == EINTR); if (file == NULL) { commandError(fd, ACK_ERROR_NO_EXIST, "could not open file " "\"%s\": %s", path_max_tmp, strerror(errno)); return -1; } - while (myFgets(path_max_tmp, sizeof(path_max_tmp), file)) { - if (path_max_tmp[0] != PLAYLIST_COMMENT && - (++nr_songs >= playlist_max_length)) - break; + if (fstat(fileno(file), &st) < 0) { + commandError(fd, ACK_ERROR_NO_EXIST, "could not stat file " + "\"%s\": %s", path_max_tmp, strerror(errno)); + return -1; } - if (nr_songs >= playlist_max_length) { + if (st.st_size >= ((MPD_PATH_MAX+1) * playlist_max_length)) { commandError(fd, ACK_ERROR_PLAYLIST_MAX, "playlist is at the max size"); return -1; |