playlist: added is_valid_playlist_name()

The function valid_playlist_name() checks the name, but it insists on reporting an eventual error to the client. The new function is_valid_playlist_name() is more generic: it just returns a boolean, and does not care what the caller will use it for. The old function valid_playlist_name() will be removed later.

playlist: added is_valid_playlist_name()
dc353eca · Max Kellermann · 59efed3e · dc353eca · dc353eca
Commit dc353eca authored Sep 07, 2008 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 3 deletions

playlist.c src/playlist.c +8 -3

playlist.h src/playlist.h +2 -0

No files found.
--- a/src/playlist.c
+++ b/src/playlist.c
@@ -1509,11 +1509,16 @@ void findSongsInPlaylist(int fd, int numItems, LocateTagItem * items)
 * protocol (and compatibility with all clients) to support idiots who
 * put '\r' and '\n' in filenames isn't going to happen, either.
 */
+int is_valid_playlist_name(const char *utf8path)
+{
+	return strchr(utf8path, '/') == NULL &&
+		strchr(utf8path, '\n') == NULL &&
+		strchr(utf8path, '\r') == NULL;
+}
+
 int valid_playlist_name(int err_fd, const char *utf8path)
 {
-	if (strchr(utf8path, '/') ||
-	    strchr(utf8path, '\n') ||
-	    strchr(utf8path, '\r')) {
+	if (!is_valid_playlist_name(utf8path)) {
 		commandError(err_fd, ACK_ERROR_ARG, "playlist name \"%s\" is "
 		             "invalid: playlist names may not contain slashes,"
 			     " newlines or carriage returns",

--- a/src/playlist.h
+++ b/src/playlist.h
@@ -137,6 +137,8 @@ void searchForSongsInPlaylist(int fd, int numItems, LocateTagItem * items);

 void findSongsInPlaylist(int fd, int numItems, LocateTagItem * items);

+int is_valid_playlist_name(const char *utf8path);
+
 int valid_playlist_name(int err_fd, const char *utf8path);

 #endif