From dc956ce993ad01d8304415d4524f4217198a3102 Mon Sep 17 00:00:00 2001 From: Magnus Holmgren Date: Sun, 3 Dec 2006 20:45:12 +0000 Subject: Make playlist catalog and playlist save screen handle .m3u/.m3u8 better. Also fix a possible null-pointer case in the playlist save screen. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@11654 a1c6a512-1295-4272-9138-f99709370657 --- apps/playlist_catalog.c | 10 +++++++--- apps/playlist_menu.c | 16 +++++++++------- 2 files changed, 16 insertions(+), 10 deletions(-) (limited to 'apps') diff --git a/apps/playlist_catalog.c b/apps/playlist_catalog.c index 0b047b0fee..54326d3ff9 100644 --- a/apps/playlist_catalog.c +++ b/apps/playlist_catalog.c @@ -453,13 +453,17 @@ bool catalog_add_to_a_playlist(char* sel, int sel_attr, bool new_playlist) if (new_playlist) { + size_t len; snprintf(playlist, MAX_PATH, "%s/", playlist_dir); if (kbd_input(playlist, MAX_PATH)) return false; - if(strlen(playlist) <= 4 || - strcasecmp(&playlist[strlen(playlist)-4], ".m3u")) - strcat(playlist, ".m3u"); + len = strlen(playlist); + + if(len > 4 && !strcasecmp(&playlist[len-4], ".m3u")) + strcat(playlist, "8"); + else if(len <= 5 || strcasecmp(&playlist[len-5], ".m3u8")) + strcat(playlist, ".m3u8"); } else { diff --git a/apps/playlist_menu.c b/apps/playlist_menu.c index 5e73621a22..2874c3b0d2 100644 --- a/apps/playlist_menu.c +++ b/apps/playlist_menu.c @@ -79,19 +79,21 @@ bool playlist_menu(void) int save_playlist_screen(struct playlist_info* playlist) { - char* filename; char temp[MAX_PATH+1]; int len; - filename = playlist_get_name(playlist, temp, sizeof(temp)); + playlist_get_name(playlist, temp, sizeof(temp)); + len = strlen(temp); - if (!filename || (len=strlen(filename)) <= 5 || - strcasecmp(&filename[len-5], ".m3u8")) - strcpy(filename, DEFAULT_DYNAMIC_PLAYLIST_NAME); + if (len > 4 && !strcasecmp(&temp[len-4], ".m3u")) + strcat(temp, "8"); + + if (len <= 5 || strcasecmp(&temp[len-5], ".m3u8")) + strcpy(temp, DEFAULT_DYNAMIC_PLAYLIST_NAME); - if (!kbd_input(filename, sizeof(temp))) + if (!kbd_input(temp, sizeof(temp))) { - playlist_save(playlist, filename); + playlist_save(playlist, temp); /* reload in case playlist was saved to cwd */ reload_directory(); -- cgit v1.2.3