devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

fix multiple slash problems

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@965 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Daniel Stenberg 2002-06-12 07:07:45 +00:00
parent 4bf4a272a4
commit c7c3d5e2ab
1 changed files with 13 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

19
apps/playlist.c
View file

@ -49,9 +49,6 @@ char* playlist_next(int type)
max = read(fd, now_playing+1, sizeof(now_playing)-1);
close(fd);
/* Only absolute paths allowed */
now_playing[0] = '/';
/* Zero-terminate the file name */
seek=0;
while((now_playing[seek] != '\n') &&
@ -61,18 +58,28 @@ char* playlist_next(int type)
now_playing[seek]=0;
return now_playing;
if('/' == now_playing[1])
return &now_playing[1];
else
return now_playing;
}
else
return NULL;
return NULL;
}
void play_list(char *dir, char *file)
{
char *sep="";
empty_playlist(&playlist);
/* If the dir does not end in trailing new line, we use a separator.
Otherwise we don't. */
if('/' != dir[strlen(dir)-1])
sep="/";
snprintf(playlist.filename, sizeof(playlist.filename),
"%s/%s", dir, file);
"%s%s%s",
dir, sep, file);
/* add track indices to playlist data structure */
add_indices_to_playlist(&playlist);