1 files changed, 140 insertions, 121 deletions

diff --git a/src/song.c b/src/song.c
index 6bb31d75d..b982b1007 100644
--- a/src/song.c
+++ b/src/song.c
@@ -35,8 +35,9 @@
 #include <string.h>
 #include <assert.h>
 
-Song * newNullSong(void) {
-	Song * song = malloc(sizeof(Song));
+Song *newNullSong(void)
+{
+	Song *song = malloc(sizeof(Song));
 
 	song->tag = NULL;
 	song->url = NULL;
@@ -46,15 +47,16 @@ Song * newNullSong(void) {
 	return song;
 }
 
-Song * newSong(char * url, int type, Directory * parentDir) {
-	Song * song = NULL;
+Song *newSong(char *url, int type, Directory * parentDir)
+{
+	Song *song = NULL;
 
-        if(strchr(url, '\n')) {
-		DEBUG("newSong: '%s' is not a valid uri\n",url);
+	if (strchr(url, '\n')) {
+		DEBUG("newSong: '%s' is not a valid uri\n", url);
 		return NULL;
 	}
 
-        song  = newNullSong();
+	song = newNullSong();
 
 	song->url = strdup(url);
 	song->type = type;
@@ -62,16 +64,17 @@ Song * newSong(char * url, int type, Directory * parentDir) {
 
 	assert(type == SONG_TYPE_URL || parentDir);
 
-	if(song->type == SONG_TYPE_FILE) {
-		InputPlugin * plugin;
+	if (song->type == SONG_TYPE_FILE) {
+		InputPlugin *plugin;
 		unsigned int next = 0;
-		char * song_url = getSongUrl(song);
-		char * abs_path = rmp2amp(utf8ToFsCharset(song_url));
-		while(!song->tag && (plugin = isMusic(song_url,
-						&(song->mtime), next++))) {
-		        song->tag = plugin->tagDupFunc(abs_path);
-                }
-		if(!song->tag || song->tag->time<0) {
+		char *song_url = getSongUrl(song);
+		char *abs_path = rmp2amp(utf8ToFsCharset(song_url));
+		while (!song->tag && (plugin = isMusic(song_url,
+						       &(song->mtime),
+						       next++))) {
+			song->tag = plugin->tagDupFunc(abs_path);
+		}
+		if (!song->tag || song->tag->time < 0) {
 			freeSong(song);
 			song = NULL;
 		}
@@ -80,30 +83,34 @@ Song * newSong(char * url, int type, Directory * parentDir) {
 	return song;
 }
 
-void freeSong(Song * song) {
+void freeSong(Song * song)
+{
 	deleteASongFromPlaylist(song);
 	freeJustSong(song);
 }
 
-void freeJustSong(Song * song) {
+void freeJustSong(Song * song)
+{
 	free(song->url);
-	if(song->tag) freeMpdTag(song->tag);
+	if (song->tag)
+		freeMpdTag(song->tag);
 	free(song);
 	getSongUrl(NULL);
 }
 
-SongList * newSongList(void) {
-	return makeList((ListFreeDataFunc *)freeSong, 0);
+SongList *newSongList(void)
+{
+	return makeList((ListFreeDataFunc *) freeSong, 0);
 }
 
-Song * addSongToList(SongList * list, char * url, char * utf8path, 
-		int songType, Directory * parentDirectory)
+Song *addSongToList(SongList * list, char *url, char *utf8path,
+		    int songType, Directory * parentDirectory)
 {
-	Song * song = NULL;
+	Song *song = NULL;
 
-	switch(songType) {
+	switch (songType) {
 	case SONG_TYPE_FILE:
-		if(isMusic(utf8path, NULL, 0)) {
+		if (isMusic(utf8path, NULL, 0)) {
 			song = newSong(url, songType, parentDirectory);
 		}
 		break;
@@ -111,83 +118,89 @@ Song * addSongToList(SongList * list, char * url, char * utf8path,
 		song = newSong(url, songType, parentDirectory);
 		break;
 	default:
-		DEBUG("addSongToList: Trying to add an invalid song type\n"); 
+		DEBUG("addSongToList: Trying to add an invalid song type\n");
 	}
 
-	if(song==NULL) return NULL;
+	if (song == NULL)
+		return NULL;
 
 	insertInList(list, song->url, (void *)song);
 
 	return song;
 }
 
-void freeSongList(SongList * list) {
+void freeSongList(SongList * list)
+{
 	freeList(list);
 }
 
-void printSongUrl(FILE * fp, Song * song) {
-	if(song->parentDir && song->parentDir->path) {
-		myfprintf(fp, "%s%s/%s\n", SONG_FILE, 
-				getDirectoryPath(song->parentDir), song->url);
-	}
-	else {
+void printSongUrl(FILE * fp, Song * song)
+{
+	if (song->parentDir && song->parentDir->path) {
+		myfprintf(fp, "%s%s/%s\n", SONG_FILE,
+			  getDirectoryPath(song->parentDir), song->url);
+	} else {
 		myfprintf(fp, "%s%s\n", SONG_FILE, song->url);
 	}
 }
 
-int printSongInfo(FILE * fp, Song * song) {
+int printSongInfo(FILE * fp, Song * song)
+{
 	printSongUrl(fp, song);
 
-	if(song->tag) printMpdTag(fp,song->tag);
+	if (song->tag)
+		printMpdTag(fp, song->tag);
 
 	return 0;
 }
 
-int printSongInfoFromList(FILE * fp, SongList * list) {
-	ListNode * tempNode = list->firstNode;
+int printSongInfoFromList(FILE * fp, SongList * list)
+{
+	ListNode *tempNode = list->firstNode;
 
-	while(tempNode!=NULL) {
-		printSongInfo(fp,(Song *)tempNode->data);
+	while (tempNode != NULL) {
+		printSongInfo(fp, (Song *) tempNode->data);
 		tempNode = tempNode->nextNode;
 	}
 
 	return 0;
 }
 
-void writeSongInfoFromList(FILE * fp, SongList * list) {
-	ListNode * tempNode = list->firstNode;
+void writeSongInfoFromList(FILE * fp, SongList * list)
+{
+	ListNode *tempNode = list->firstNode;
 
-	myfprintf(fp,"%s\n",SONG_BEGIN);
+	myfprintf(fp, "%s\n", SONG_BEGIN);
 
-	while(tempNode!=NULL) {
-		myfprintf(fp,"%s%s\n",SONG_KEY,tempNode->key);
-		printSongInfo(fp,(Song *)tempNode->data);
-		myfprintf(fp,"%s%li\n",SONG_MTIME,(long)((Song *)tempNode->data)->mtime);
+	while (tempNode != NULL) {
+		myfprintf(fp, "%s%s\n", SONG_KEY, tempNode->key);
+		printSongInfo(fp, (Song *) tempNode->data);
+		myfprintf(fp, "%s%li\n", SONG_MTIME,
+			  (long)((Song *) tempNode->data)->mtime);
 		tempNode = tempNode->nextNode;
 	}
 
-	myfprintf(fp,"%s\n",SONG_END);
+	myfprintf(fp, "%s\n", SONG_END);
 }
 
-static void insertSongIntoList(SongList * list, ListNode ** nextSongNode, char * key,
-		Song * song)
+static void insertSongIntoList(SongList * list, ListNode ** nextSongNode,
+			       char *key, Song * song)
 {
-	ListNode * nodeTemp;
-	int cmpRet= 0;
+	ListNode *nodeTemp;
+	int cmpRet = 0;
 
-	while(*nextSongNode && (cmpRet = strcmp(key,(*nextSongNode)->key)) > 0) 
-	{
+	while (*nextSongNode
+	       && (cmpRet = strcmp(key, (*nextSongNode)->key)) > 0) {
 		nodeTemp = (*nextSongNode)->nextNode;
-		deleteNodeFromList(list,*nextSongNode);
+		deleteNodeFromList(list, *nextSongNode);
 		*nextSongNode = nodeTemp;
 	}
 
-	if(!(*nextSongNode)) {
+	if (!(*nextSongNode)) {
 		insertInList(list, song->url, (void *)song);
-	}
-	else if(cmpRet == 0) {
-		Song * tempSong = (Song *)((*nextSongNode)->data);
-		if(tempSong->mtime != song->mtime) {
+	} else if (cmpRet == 0) {
+		Song *tempSong = (Song *) ((*nextSongNode)->data);
+		if (tempSong->mtime != song->mtime) {
 			freeMpdTag(tempSong->tag);
 			tempSong->tag = song->tag;
 			tempSong->mtime = song->mtime;
@@ -195,20 +208,19 @@ static void insertSongIntoList(SongList * list, ListNode ** nextSongNode, char *
 		}
 		freeJustSong(song);
 		*nextSongNode = (*nextSongNode)->nextNode;
-	}
-	else {
-		insertInListBeforeNode(list, *nextSongNode, -1, song->url, 
-					(void *)song);
+	} else {
+		insertInListBeforeNode(list, *nextSongNode, -1, song->url,
+				       (void *)song);
 	}
 }
 
-static int matchesAnMpdTagItemKey(char * buffer, int * itemType) {
+static int matchesAnMpdTagItemKey(char *buffer, int *itemType)
+{
 	int i;
 
-	for(i = 0; i < TAG_NUM_OF_ITEM_TYPES; i++) {
-		if( 0 == strncmp(mpdTagItemKeys[i], buffer, 
-				strlen(mpdTagItemKeys[i])))
-		{
+	for (i = 0; i < TAG_NUM_OF_ITEM_TYPES; i++) {
+		if (0 == strncmp(mpdTagItemKeys[i], buffer,
+				 strlen(mpdTagItemKeys[i]))) {
 			*itemType = i;
 			return 1;
 		}
@@ -217,84 +229,88 @@ static int matchesAnMpdTagItemKey(char * buffer, int * itemType) {
 	return 0;
 }
 
-void readSongInfoIntoList(FILE * fp, SongList * list, Directory * parentDir) {
-	char buffer[MAXPATHLEN+1024];
-	int bufferSize = MAXPATHLEN+1024;
-	Song * song = NULL;
-	ListNode * nextSongNode = list->firstNode;
-	ListNode * nodeTemp;
+void readSongInfoIntoList(FILE * fp, SongList * list, Directory * parentDir)
+{
+	char buffer[MAXPATHLEN + 1024];
+	int bufferSize = MAXPATHLEN + 1024;
+	Song *song = NULL;
+	ListNode *nextSongNode = list->firstNode;
+	ListNode *nodeTemp;
 	int itemType;
 
-	while(myFgets(buffer,bufferSize,fp) && 0!=strcmp(SONG_END,buffer)) {
-		if(0==strncmp(SONG_KEY,buffer,strlen(SONG_KEY))) {
-			if(song) {
-				insertSongIntoList(list,&nextSongNode,
-						song->url,
-						song);
+	while (myFgets(buffer, bufferSize, fp) && 0 != strcmp(SONG_END, buffer)) {
+		if (0 == strncmp(SONG_KEY, buffer, strlen(SONG_KEY))) {
+			if (song) {
+				insertSongIntoList(list, &nextSongNode,
+						   song->url, song);
 				song = NULL;
 			}
 
 			song = newNullSong();
-			song->url = strdup(buffer+strlen(SONG_KEY));
+			song->url = strdup(buffer + strlen(SONG_KEY));
 			song->type = SONG_TYPE_FILE;
 			song->parentDir = parentDir;
-		}
-		else if(0==strncmp(SONG_FILE,buffer,strlen(SONG_FILE))) {
-			if(!song) {
+		} else if (0 == strncmp(SONG_FILE, buffer, strlen(SONG_FILE))) {
+			if (!song) {
 				ERROR("Problems reading song info\n");
 				exit(EXIT_FAILURE);
 			}
 			/* we don't need this info anymore
-			song->url = strdup(&(buffer[strlen(SONG_FILE)]));
-			*/
-		}
-		else if(matchesAnMpdTagItemKey(buffer, &itemType)) {
-			if(!song->tag) song->tag = newMpdTag();
+			   song->url = strdup(&(buffer[strlen(SONG_FILE)]));
+			 */
+		} else if (matchesAnMpdTagItemKey(buffer, &itemType)) {
+			if (!song->tag)
+				song->tag = newMpdTag();
 			addItemToMpdTag(song->tag, itemType,
-				&(buffer[strlen(mpdTagItemKeys[itemType])+2]));
-		}
-		else if(0==strncmp(SONG_TIME,buffer,strlen(SONG_TIME))) {
-			if(!song->tag) song->tag = newMpdTag();
+					&(buffer
+					  [strlen(mpdTagItemKeys[itemType]) +
+					   2]));
+		} else if (0 == strncmp(SONG_TIME, buffer, strlen(SONG_TIME))) {
+			if (!song->tag)
+				song->tag = newMpdTag();
 			song->tag->time = atoi(&(buffer[strlen(SONG_TIME)]));
-		}
-		else if(0==strncmp(SONG_MTIME,buffer,strlen(SONG_MTIME))) {
+		} else if (0 == strncmp(SONG_MTIME, buffer, strlen(SONG_MTIME))) {
 			song->mtime = atoi(&(buffer[strlen(SONG_MTIME)]));
 		}
 		/* ignore empty lines (starting with '\0') */
-		else if(*buffer){
-			ERROR("songinfo: unknown line in db: %s\n",buffer);
+		else if (*buffer) {
+			ERROR("songinfo: unknown line in db: %s\n", buffer);
 			exit(EXIT_FAILURE);
 		}
 	}
 
-	if(song) {
+	if (song) {
 		insertSongIntoList(list, &nextSongNode, song->url, song);
 		song = NULL;
 	}
 
-	while(nextSongNode) {
+	while (nextSongNode) {
 		nodeTemp = nextSongNode->nextNode;
-		deleteNodeFromList(list,nextSongNode);
+		deleteNodeFromList(list, nextSongNode);
 		nextSongNode = nodeTemp;
 	}
 }
 
-int updateSongInfo(Song * song) {
-	if(song->type == SONG_TYPE_FILE) {
-		InputPlugin * plugin;
+int updateSongInfo(Song * song)
+{
+	if (song->type == SONG_TYPE_FILE) {
+		InputPlugin *plugin;
 		unsigned int next = 0;
-		char * song_url = getSongUrl(song);
-		char * abs_path = rmp2amp(song_url);
+		char *song_url = getSongUrl(song);
+		char *abs_path = rmp2amp(song_url);
 
-		if(song->tag) freeMpdTag(song->tag);
+		if (song->tag)
+			freeMpdTag(song->tag);
 
 		song->tag = NULL;
 
-		while(!song->tag && (plugin = isMusic(song_url,
-						&(song->mtime), next++))) {
+		while (!song->tag && (plugin = isMusic(song_url,
+						       &(song->mtime),
+						       next++))) {
 			song->tag = plugin->tagDupFunc(abs_path);
 		}
-		if(!song->tag || song->tag->time<0) return -1;
+		if (!song->tag || song->tag->time < 0)
+			return -1;
 	}
 
 	return 0;
@@ -302,37 +318,40 @@ int updateSongInfo(Song * song) {
 
 /* pass song = NULL to reset, we do this freeJustSong(), so that if
  * 	we free and recreate this memory we make sure to print it correctly*/
-char * getSongUrl(Song * song) {
-	static char * buffer = NULL;
+char *getSongUrl(Song * song)
+{
+	static char *buffer = NULL;
 	static int bufferSize = 0;
-	static Song * lastSong = NULL;
+	static Song *lastSong = NULL;
 	int slen;
 	int dlen;
 	int size;
 
-	if(!song) {
+	if (!song) {
 		lastSong = song;
 		return NULL;
 	}
 
-	if(!song->parentDir || !song->parentDir->path) return song->url;
+	if (!song->parentDir || !song->parentDir->path)
+		return song->url;
 
-	/* be careful with this!*/
-	if(song == lastSong) return buffer;
+	/* be careful with this! */
+	if (song == lastSong)
+		return buffer;
 
 	slen = strlen(song->url);
 	dlen = strlen(getDirectoryPath(song->parentDir));
 
-	size = slen+dlen+2;
+	size = slen + dlen + 2;
 
-	if(size > bufferSize) {
+	if (size > bufferSize) {
 		buffer = realloc(buffer, size);
 		bufferSize = size;
 	}
 
 	strcpy(buffer, getDirectoryPath(song->parentDir));
 	buffer[dlen] = '/';
-	strcpy(buffer+dlen+1, song->url);
+	strcpy(buffer + dlen + 1, song->url);
 
 	return buffer;
 }