a234780aab
These are just warnings from sparse, but it makes the output easier to read. I ran this through a quick perl script, but of course verified the output by looking at the diff and making sure the thing still compiles. here's the quick perl script I wrote to generate this patch: ----------- 8< ----------- use Tie::File; defined(my $pid = open my $fh, '-|') or die $!; if (!$pid) { open STDERR, '>&STDOUT' or die $!; exec 'sparse', @ARGV or die $!; } my $na = 'warning: non-ANSI function declaration of function'; while (<$fh>) { print STDERR $_; if (/^(.+?\.[ch]):(\d+):(\d+): $na '(\w+)'/o) { my ($f, $l, $pos, $func) = ($1, $2, $3, $4); $l--; tie my @x, 'Tie::File', $f or die "$!: $f"; print '-', $x[$l], "\n"; $x[$l] =~ s/\b($func\s*)\(\s*\)/$1(void)/; print '+', $x[$l], "\n"; untie @x; } } git-svn-id: https://svn.musicpd.org/mpd/trunk@4378 09075e82-0dd4-0310-85a5-a0d7c8717e4f
339 lines
7.9 KiB
C
339 lines
7.9 KiB
C
/* the Music Player Daemon (MPD)
|
|
* (c)2003-2006 by Warren Dukes (warren.dukes@gmail.com)
|
|
* This project's homepage is: http://www.musicpd.org
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
*/
|
|
|
|
#include "song.h"
|
|
#include "ls.h"
|
|
#include "directory.h"
|
|
#include "utils.h"
|
|
#include "tag.h"
|
|
#include "log.h"
|
|
#include "path.h"
|
|
#include "playlist.h"
|
|
#include "inputPlugin.h"
|
|
|
|
#define SONG_KEY "key: "
|
|
#define SONG_FILE "file: "
|
|
#define SONG_TIME "Time: "
|
|
#define SONG_MTIME "mtime: "
|
|
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <assert.h>
|
|
|
|
Song * newNullSong(void) {
|
|
Song * song = malloc(sizeof(Song));
|
|
|
|
song->tag = NULL;
|
|
song->url = NULL;
|
|
song->type = SONG_TYPE_FILE;
|
|
song->parentDir = NULL;
|
|
|
|
return song;
|
|
}
|
|
|
|
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);
|
|
return NULL;
|
|
}
|
|
|
|
song = newNullSong();
|
|
|
|
song->url = strdup(url);
|
|
song->type = type;
|
|
song->parentDir = parentDir;
|
|
|
|
assert(type == SONG_TYPE_URL || parentDir);
|
|
|
|
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) {
|
|
freeSong(song);
|
|
song = NULL;
|
|
}
|
|
}
|
|
|
|
return song;
|
|
}
|
|
|
|
void freeSong(Song * song) {
|
|
deleteASongFromPlaylist(song);
|
|
freeJustSong(song);
|
|
}
|
|
|
|
void freeJustSong(Song * song) {
|
|
free(song->url);
|
|
if(song->tag) freeMpdTag(song->tag);
|
|
free(song);
|
|
getSongUrl(NULL);
|
|
}
|
|
|
|
SongList * newSongList(void) {
|
|
return makeList((ListFreeDataFunc *)freeSong, 0);
|
|
}
|
|
|
|
Song * addSongToList(SongList * list, char * url, char * utf8path,
|
|
int songType, Directory * parentDirectory)
|
|
{
|
|
Song * song = NULL;
|
|
|
|
switch(songType) {
|
|
case SONG_TYPE_FILE:
|
|
if(isMusic(utf8path, NULL, 0)) {
|
|
song = newSong(url, songType, parentDirectory);
|
|
}
|
|
break;
|
|
case SONG_TYPE_URL:
|
|
song = newSong(url, songType, parentDirectory);
|
|
break;
|
|
default:
|
|
DEBUG("addSongToList: Trying to add an invalid song type\n");
|
|
}
|
|
|
|
if(song==NULL) return NULL;
|
|
|
|
insertInList(list, song->url, (void *)song);
|
|
|
|
return song;
|
|
}
|
|
|
|
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 {
|
|
myfprintf(fp, "%s%s\n", SONG_FILE, song->url);
|
|
}
|
|
}
|
|
|
|
int printSongInfo(FILE * fp, Song * song) {
|
|
printSongUrl(fp, song);
|
|
|
|
if(song->tag) printMpdTag(fp,song->tag);
|
|
|
|
return 0;
|
|
}
|
|
|
|
int printSongInfoFromList(FILE * fp, SongList * list) {
|
|
ListNode * tempNode = list->firstNode;
|
|
|
|
while(tempNode!=NULL) {
|
|
printSongInfo(fp,(Song *)tempNode->data);
|
|
tempNode = tempNode->nextNode;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
void writeSongInfoFromList(FILE * fp, SongList * list) {
|
|
ListNode * tempNode = list->firstNode;
|
|
|
|
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);
|
|
tempNode = tempNode->nextNode;
|
|
}
|
|
|
|
myfprintf(fp,"%s\n",SONG_END);
|
|
}
|
|
|
|
static void insertSongIntoList(SongList * list, ListNode ** nextSongNode, char * key,
|
|
Song * song)
|
|
{
|
|
ListNode * nodeTemp;
|
|
int cmpRet= 0;
|
|
|
|
while(*nextSongNode && (cmpRet = strcmp(key,(*nextSongNode)->key)) > 0)
|
|
{
|
|
nodeTemp = (*nextSongNode)->nextNode;
|
|
deleteNodeFromList(list,*nextSongNode);
|
|
*nextSongNode = nodeTemp;
|
|
}
|
|
|
|
if(!(*nextSongNode)) {
|
|
insertInList(list, song->url, (void *)song);
|
|
}
|
|
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;
|
|
song->tag = NULL;
|
|
}
|
|
freeJustSong(song);
|
|
*nextSongNode = (*nextSongNode)->nextNode;
|
|
}
|
|
else {
|
|
insertInListBeforeNode(list, *nextSongNode, -1, song->url,
|
|
(void *)song);
|
|
}
|
|
}
|
|
|
|
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])))
|
|
{
|
|
*itemType = i;
|
|
return 1;
|
|
}
|
|
}
|
|
|
|
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;
|
|
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);
|
|
song = NULL;
|
|
}
|
|
|
|
song = newNullSong();
|
|
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) {
|
|
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();
|
|
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();
|
|
song->tag->time = atoi(&(buffer[strlen(SONG_TIME)]));
|
|
}
|
|
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);
|
|
exit(EXIT_FAILURE);
|
|
}
|
|
}
|
|
|
|
if(song) {
|
|
insertSongIntoList(list, &nextSongNode, song->url, song);
|
|
song = NULL;
|
|
}
|
|
|
|
while(nextSongNode) {
|
|
nodeTemp = nextSongNode->nextNode;
|
|
deleteNodeFromList(list,nextSongNode);
|
|
nextSongNode = nodeTemp;
|
|
}
|
|
}
|
|
|
|
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);
|
|
|
|
if(song->tag) freeMpdTag(song->tag);
|
|
|
|
song->tag = NULL;
|
|
|
|
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;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
/* 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;
|
|
static int bufferSize = 0;
|
|
static Song * lastSong = NULL;
|
|
int slen;
|
|
int dlen;
|
|
int size;
|
|
|
|
if(!song) {
|
|
lastSong = song;
|
|
return NULL;
|
|
}
|
|
|
|
if(!song->parentDir || !song->parentDir->path) return song->url;
|
|
|
|
/* be careful with this!*/
|
|
if(song == lastSong) return buffer;
|
|
|
|
slen = strlen(song->url);
|
|
dlen = strlen(getDirectoryPath(song->parentDir));
|
|
|
|
size = slen+dlen+2;
|
|
|
|
if(size > bufferSize) {
|
|
buffer = realloc(buffer, size);
|
|
bufferSize = size;
|
|
}
|
|
|
|
strcpy(buffer, getDirectoryPath(song->parentDir));
|
|
buffer[dlen] = '/';
|
|
strcpy(buffer+dlen+1, song->url);
|
|
|
|
return buffer;
|
|
}
|