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

fix bug #307

Browse Source 
git-svn-id: https://svn.musicpd.org/mpd/trunk@2230 09075e82-0dd4-0310-85a5-a0d7c8717e4f
This commit is contained in:
Warren Dukes 2004-10-15 18:27:29 +00:00
parent d05c3b510e
commit c0e0c2460f
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/playlist.c
View File

@ -1318,7 +1318,7 @@ int savePlaylist(FILE * fp, char * utf8file) {
int loadPlaylist(FILE * fp, char * utf8file) { int loadPlaylist(FILE * fp, char * utf8file) {
FILE * fileP; FILE * fileP;
char s[MAXPATHLEN*1]; char s[MAXPATHLEN+1];
int slength = 0; int slength = 0;
char * temp = strdup(utf8ToFsCharset(utf8file)); char * temp = strdup(utf8ToFsCharset(utf8file));
char * rfile = malloc(strlen(temp)+strlen(".")+ char * rfile = malloc(strlen(temp)+strlen(".")+
@ -1328,6 +1328,7 @@ int loadPlaylist(FILE * fp, char * utf8file) {
int parentlen = strlen(parent); int parentlen = strlen(parent);
char * erroredFile = NULL; char * erroredFile = NULL;
int tempInt; int tempInt;
int commentCharFound = 0;
strcpy(rfile,temp); strcpy(rfile,temp);
strcat(rfile,"."); strcat(rfile,".");
@ -1353,7 +1354,11 @@ int loadPlaylist(FILE * fp, char * utf8file) {
while((tempInt = fgetc(fileP))!=EOF) { while((tempInt = fgetc(fileP))!=EOF) {
s[slength] = tempInt; s[slength] = tempInt;
if(s[slength]=='\n' || s[slength]=='\0') { if(s[slength]=='\n' || s[slength]=='\0') {
commentCharFound = 0;
s[slength] = '\0'; s[slength] = '\0';
if(s[0]==PLAYLIST_COMMENT) {
commentCharFound = 1;
}
if(strncmp(s,musicDir,strlen(musicDir))==0) { if(strncmp(s,musicDir,strlen(musicDir))==0) {
strcpy(s,&(s[strlen(musicDir)])); strcpy(s,&(s[strlen(musicDir)]));
} }
@ -1379,7 +1384,7 @@ int loadPlaylist(FILE * fp, char * utf8file) {
temp = fsCharsetToUtf8(s); temp = fsCharsetToUtf8(s);
if(!temp) continue; if(!temp) continue;
temp = strdup(temp); temp = strdup(temp);
if(s[0]==PLAYLIST_COMMENT && !getSongFromDB(temp) if(commentCharFound && !getSongFromDB(temp)
&& !isRemoteUrl(temp)) && !isRemoteUrl(temp))
{ {
free(temp); free(temp);