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

support for relative paths in playlists by Brian King <brking@charter.net>

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1506 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Daniel Stenberg 2002-08-01 11:37:26 +00:00
parent e71fcaa59f
commit af6ceba2a3
1 changed files with 26 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

28
apps/playlist.c
View file

@ -42,6 +42,8 @@ char* playlist_next(int steps, char *dirname)
int fd; int fd;
int i; int i;
char buf[MAX_PATH+1]; char buf[MAX_PATH+1];
char dir_buf[MAX_PATH+1];
char *dir_end;
playlist.index = (playlist.index+steps) % playlist.amount; playlist.index = (playlist.index+steps) % playlist.amount;
seek = playlist.indices[playlist.index]; seek = playlist.indices[playlist.index];
@ -81,10 +83,32 @@ char* playlist_next(int steps, char *dirname)
strcpy(now_playing, &buf[2]); strcpy(now_playing, &buf[2]);
return now_playing; return now_playing;
} }
else { else if ( '.' == buf[0] && '.' == buf[1] && '/' == buf[2] ) {
snprintf(now_playing, MAX_PATH+1, "%s/%s", dirname, buf); /* handle relative paths */
seek=3;
while(buf[seek] == '.' &&
buf[seek+1] == '.' &&
buf[seek+2] == '/')
seek += 3;
strcpy(dir_buf, dirname);
for (i=0; i<seek/3; i++) {
dir_end = strrchr(dir_buf, '/');
if (dir_end)
*dir_end = '\0';
else
break;
}
snprintf(now_playing, MAX_PATH+1, "%s/%s", dir_buf, &buf[seek]);
return now_playing; return now_playing;
} }
else if ( '.' == buf[0] && '/' == buf[1] ) {
snprintf(now_playing, MAX_PATH+1, "%s/%s", dirname, &buf[2]);
return now_playing;
}
else {
snprintf(now_playing, MAX_PATH+1, "%s/%s", dirname, buf);
return now_playing;
}
} }
} }
else else