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

playlist: moved "repeat" and "random" value checks to command.c

Browse Source 
Client's input values should be validated by the command
implementation, and the core libraries shouldn't talk to the client
directly if possible.  Thus, setPlaylistRepeatStatus() and
setPlaylistRandomStatus() don't get the file descriptor, and cannot
fail (return void).
This commit is contained in:
Max Kellermann 2008-09-07 13:38:59 +02:00
parent d1df71ebbc
commit e1bf96672e
3 changed files with 26 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/command.c
View File

@ -773,7 +773,15 @@ static int handleRepeat(int fd, mpd_unused int *permission,
if (check_int(fd, &status, argv[1], need_integer) < 0)
return -1;
return setPlaylistRepeatStatus(fd, status);
if (status != 0 && status != 1) {
commandError(fd, ACK_ERROR_ARG,
"\"%i\" is not 0 or 1", status);
return -1;
}
setPlaylistRepeatStatus(status);
return 0;
}
static int handleRandom(int fd, mpd_unused int *permission,
@ -783,7 +791,15 @@ static int handleRandom(int fd, mpd_unused int *permission,
if (check_int(fd, &status, argv[1], need_integer) < 0)
return -1;
return setPlaylistRandomStatus(fd, status);
if (status != 0 && status != 1) {
commandError(fd, ACK_ERROR_ARG,
"\"%i\" is not 0 or 1", status);
return -1;
}
setPlaylistRandomStatus(status);
return 0;
}
static int handleStats(int fd, mpd_unused int *permission,

26
src/playlist.c
View File

@ -327,9 +327,9 @@ void readPlaylistState(FILE *fp)
if (strcmp
(&(buffer[strlen(PLAYLIST_STATE_FILE_REPEAT)]),
"1") == 0) {
setPlaylistRepeatStatus(STDERR_FILENO, 1);
setPlaylistRepeatStatus(1);
} else
setPlaylistRepeatStatus(STDERR_FILENO, 0);
setPlaylistRepeatStatus(0);
} else
if (strncmp
(buffer, PLAYLIST_STATE_FILE_CROSSFADE,
@ -348,9 +348,9 @@ void readPlaylistState(FILE *fp)
(buffer
[strlen(PLAYLIST_STATE_FILE_RANDOM)]),
"1") == 0) {
setPlaylistRandomStatus(STDERR_FILENO, 1);
setPlaylistRandomStatus(1);
} else
setPlaylistRandomStatus(STDERR_FILENO, 0);
setPlaylistRandomStatus(0);
} else if (strncmp(buffer, PLAYLIST_STATE_FILE_CURRENT,
strlen(PLAYLIST_STATE_FILE_CURRENT))
== 0) {
@ -1012,21 +1012,14 @@ int getPlaylistRandomStatus(void)
return playlist.random;
}
int setPlaylistRepeatStatus(int fd, int status)
void setPlaylistRepeatStatus(int status)
{
if (status != 0 && status != 1) {
commandError(fd, ACK_ERROR_ARG, "\"%i\" is not 0 or 1", status);
return -1;
}
if (playlist_state == PLAYLIST_STATE_PLAY) {
if (playlist.repeat && !status && playlist.queued == 0)
clearPlayerQueue();
}
playlist.repeat = status;
return 0;
}
int moveSongInPlaylist(int fd, int from, int to)
@ -1183,15 +1176,10 @@ static void randomizeOrder(int start, int end)
}
}
int setPlaylistRandomStatus(int fd, int status)
void setPlaylistRandomStatus(int status)
{
int statusWas = playlist.random;
if (status != 0 && status != 1) {
commandError(fd, ACK_ERROR_ARG, "\"%i\" is not 0 or 1", status);
return -1;
}
playlist.random = status;
if (status != statusWas) {
@ -1209,8 +1197,6 @@ int setPlaylistRandomStatus(int fd, int status)
} else
orderPlaylist();
}
return 0;
}
void previousSongInPlaylist(void)

4
src/playlist.h
View File

@ -105,11 +105,11 @@ int loadPlaylist(int fd, const char *utf8file);
int getPlaylistRepeatStatus(void);
int setPlaylistRepeatStatus(int fd, int status);
void setPlaylistRepeatStatus(int status);
int getPlaylistRandomStatus(void);
int setPlaylistRandomStatus(int fd, int status);
void setPlaylistRandomStatus(int status);
int getPlaylistCurrentSong(void);