![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/libmpdclient.c b/src/libmpdclient.c
index a8bbabef7bd046a2b3bf0de1992c64e3764c9511..27bd9ad525fec8849c3d9469fcf538df317f0a2d 100644 (file)
--- a/src/libmpdclient.c
+++ b/src/libmpdclient.c
/* libmpdclient
- (c)2003-2004 by Warren Dukes (shank@mercury.chem.pitt.edu)
+ (c)2003-2006 by Warren Dukes (warren.dukes@gmail.com)
This project's homepage is: http://www.musicpd.org
-
+
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:
-
+
- Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
-
+
- Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
-
+
- Neither the name of the Music Player Daemon nor the names of its
contributors may be used to endorse or promote products derived from
this software without specific prior written permission.
-
+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
*/
-
#include "libmpdclient.h"
#include <errno.h>
#include <sys/types.h>
-#include <sys/socket.h>
-#include <netdb.h>
#include <stdio.h>
#include <sys/param.h>
-
-
#include <string.h>
-#include <strings.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
#include <unistd.h>
#include <stdlib.h>
#include <fcntl.h>
-#include <stdarg.h>
-#ifndef MPD_NO_IPV6
-#ifdef AF_INET6
-#define MPD_HAVE_IPV6
-#endif
+#ifdef WIN32
+# include <ws2tcpip.h>
+# include <winsock.h>
+#else
+# include <netinet/in.h>
+# include <arpa/inet.h>
+# include <sys/socket.h>
+# include <netdb.h>
#endif
#ifndef MSG_DONTWAIT
-#define MSG_DONTWAIT 0
+# define MSG_DONTWAIT 0
+#endif
+
+#ifndef MPD_NO_GAI
+# ifdef AI_ADDRCONFIG
+# define MPD_HAVE_GAI
+# endif
+#endif
+
+#define COMMAND_LIST 1
+#define COMMAND_LIST_OK 2
+
+#ifdef WIN32
+# define SELECT_ERRNO_IGNORE (errno == WSAEINTR || errno == WSAEINPROGRESS)
+# define SENDRECV_ERRNO_IGNORE SELECT_ERRNO_IGNORE
+#else
+# define SELECT_ERRNO_IGNORE (errno == EINTR)
+# define SENDRECV_ERRNO_IGNORE (errno == EINTR || errno == EAGAIN)
+# define winsock_dll_error(c) 0
+# define closesocket(s) close(s)
+# define WSACleanup() do { /* nothing */ } while (0)
#endif
-#define COMMAND_LIST 1
-#define COMMAND_LIST_OK 2
+#ifdef WIN32
+static int winsock_dll_error(mpd_Connection *connection)
+{
+ WSADATA wsaData;
+ if ((WSAStartup(MAKEWORD(2, 2), &wsaData)) != 0 ||
+ LOBYTE(wsaData.wVersion) != 2 ||
+ HIBYTE(wsaData.wVersion) != 2 ) {
+ snprintf(connection->errorStr,MPD_BUFFER_MAX_LENGTH,
+ "Could not find usable WinSock DLL.");
+ connection->error = MPD_ERROR_SYSTEM;
+ return 1;
+ }
+ return 0;
+}
+
+static int do_connect_fail(mpd_Connection *connection,
+ const struct sockaddr *serv_addr, int addrlen)
+{
+ int iMode = 1; /* 0 = blocking, else non-blocking */
+ ioctlsocket(connection->sock, FIONBIO, (u_long FAR*) &iMode);
+ return (connect(connection->sock,serv_addr,addrlen) == SOCKET_ERROR
+ && WSAGetLastError() != WSAEWOULDBLOCK);
+}
+#else /* !WIN32 (sane operating systems) */
+static int do_connect_fail(mpd_Connection *connection,
+ const struct sockaddr *serv_addr, int addrlen)
+{
+ int flags = fcntl(connection->sock, F_GETFL, 0);
+ fcntl(connection->sock, F_SETFL, flags | O_NONBLOCK);
+ return (connect(connection->sock,serv_addr,addrlen)<0 &&
+ errno!=EINPROGRESS);
+}
+#endif /* !WIN32 */
+
+#ifdef MPD_HAVE_GAI
+static int mpd_connect(mpd_Connection * connection, const char * host, int port,
+ float timeout)
+{
+ int error;
+ char service[20];
+ struct addrinfo hints;
+ struct addrinfo *res = NULL;
+ struct addrinfo *addrinfo = NULL;
+
+ /**
+ * Setup hints
+ */
+ hints.ai_flags = AI_ADDRCONFIG;
+ hints.ai_family = PF_UNSPEC;
+ hints.ai_socktype = SOCK_STREAM;
+ hints.ai_protocol = IPPROTO_TCP;
+ hints.ai_addrlen = 0;
+ hints.ai_addr = NULL;
+ hints.ai_canonname = NULL;
+ hints.ai_next = NULL;
+
+ snprintf(service, sizeof(service), "%d", port);
+
+ error = getaddrinfo(host, service, &hints, &addrinfo);
+
+ if (error) {
+ snprintf(connection->errorStr,MPD_BUFFER_MAX_LENGTH,
+ "host \"%s\" not found: %s",host, gai_strerror(error));
+ connection->error = MPD_ERROR_UNKHOST;
+ return -1;
+ }
+
+ for (res = addrinfo; res; res = res->ai_next) {
+ /* create socket */
+ connection->sock = socket(res->ai_family, SOCK_STREAM, res->ai_protocol);
+ if (connection->sock < 0) {
+ snprintf(connection->errorStr, MPD_BUFFER_MAX_LENGTH,
+ "problems creating socket: %s",
+ strerror(errno));
+ connection->error = MPD_ERROR_SYSTEM;
+ freeaddrinfo(addrinfo);
+ return -1;
+ }
+
+ mpd_setConnectionTimeout(connection,timeout);
+
+ /* connect stuff */
+ if (do_connect_fail(connection, res->ai_addr, res->ai_addrlen)) {
+ /* try the next address family */
+ closesocket(connection->sock);
+ connection->sock = -1;
+ continue;
+ }
+ }
+ freeaddrinfo(addrinfo);
+
+ if (connection->sock < 0) {
+ snprintf(connection->errorStr,MPD_BUFFER_MAX_LENGTH,
+ "problems connecting to \"%s\" on port"
+ " %i: %s",host,port, strerror(errno));
+ connection->error = MPD_ERROR_CONNPORT;
+
+ return -1;
+ }
+
+ return 0;
+}
+#else /* !MPD_HAVE_GAI */
+static int mpd_connect(mpd_Connection * connection, const char * host, int port,
+ float timeout)
+{
+ struct hostent * he;
+ struct sockaddr * dest;
+ int destlen;
+ struct sockaddr_in sin;
+
+ if(!(he=gethostbyname(host))) {
+ snprintf(connection->errorStr,MPD_BUFFER_MAX_LENGTH,
+ "host \"%s\" not found",host);
+ connection->error = MPD_ERROR_UNKHOST;
+ return -1;
+ }
+
+ memset(&sin,0,sizeof(struct sockaddr_in));
+ /*dest.sin_family = he->h_addrtype;*/
+ sin.sin_family = AF_INET;
+ sin.sin_port = htons(port);
+
+ switch(he->h_addrtype) {
+ case AF_INET:
+ memcpy((char *)&sin.sin_addr.s_addr,(char *)he->h_addr,
+ he->h_length);
+ dest = (struct sockaddr *)&sin;
+ destlen = sizeof(struct sockaddr_in);
+ break;
+ default:
+ strcpy(connection->errorStr,"address type is not IPv4\n");
+ connection->error = MPD_ERROR_SYSTEM;
+ return -1;
+ break;
+ }
+
+ if((connection->sock = socket(dest->sa_family,SOCK_STREAM,0))<0) {
+ strcpy(connection->errorStr,"problems creating socket");
+ connection->error = MPD_ERROR_SYSTEM;
+ return -1;
+ }
+
+ mpd_setConnectionTimeout(connection,timeout);
+
+ /* connect stuff */
+ if (do_connect_fail(connection, dest, destlen)) {
+ snprintf(connection->errorStr,MPD_BUFFER_MAX_LENGTH,
+ "problems connecting to \"%s\" on port"
+ " %i",host,port);
+ connection->error = MPD_ERROR_CONNPORT;
+ return -1;
+ }
+
+ return 0;
+}
+#endif /* !MPD_HAVE_GAI */
char * mpdTagItemKeys[MPD_TAG_NUM_OF_ITEM_TYPES] =
{
"Composer",
"Performer",
"Comment",
+ "Disc",
"filename"
};
-
-#ifdef MPD_HAVE_IPV6
-int mpd_ipv6Supported() {
- int s;
- s = socket(AF_INET6,SOCK_STREAM,0);
- if(s == -1) return 0;
- close(s);
- return 1;
-}
-#endif
-
static char * mpd_sanitizeArg(const char * arg) {
size_t i;
char * ret;
register const char *c;
register char *rc;
-
- /*
- unsigned int count = 0;
-
- c = arg;
- for(i = strlen(arg); i != 0; --i) {
- if(*c=='"' || *c=='\\') count++;
- c++;
- }
- ret = malloc(strlen(arg)+count+1);
- */
+
/* instead of counting in that loop above, just
* use a bit more memory and half running time
*/
return ret;
}
-mpd_ReturnElement * mpd_newReturnElement(const char * name, const char * value)
+static mpd_ReturnElement * mpd_newReturnElement(const char * name, const char * value)
{
mpd_ReturnElement * ret = malloc(sizeof(mpd_ReturnElement));
- ret->name = (char *)strdup(name);
- ret->value = (char *)strdup(value);
+ ret->name = strdup(name);
+ ret->value = strdup(value);
return ret;
}
-void mpd_freeReturnElement(mpd_ReturnElement * re) {
+static void mpd_freeReturnElement(mpd_ReturnElement * re) {
free(re->name);
free(re->value);
free(re);
}
void mpd_setConnectionTimeout(mpd_Connection * connection, float timeout) {
- connection->timeout.tv_sec = (int)timeout;
- connection->timeout.tv_usec = (int)(timeout*1e6 -
- connection->timeout.tv_sec*1000000+0.5);
+ connection->timeout.tv_sec = (int)timeout;
+ connection->timeout.tv_usec = (int)(timeout*1e6 -
+ connection->timeout.tv_sec*1000000 +
+ 0.5);
+}
+
+static int mpd_parseWelcome(mpd_Connection * connection, const char * host, int port,
+ char * rt, char * output) {
+ char * tmp;
+ char * test;
+ int i;
+
+ if(strncmp(output,MPD_WELCOME_MESSAGE,strlen(MPD_WELCOME_MESSAGE))) {
+ snprintf(connection->errorStr,MPD_BUFFER_MAX_LENGTH,
+ "mpd not running on port %i on host \"%s\"",
+ port,host);
+ connection->error = MPD_ERROR_NOTMPD;
+ return 1;
+ }
+
+ tmp = &output[strlen(MPD_WELCOME_MESSAGE)];
+
+ for(i=0;i<3;i++) {
+ if(tmp) connection->version[i] = strtol(tmp,&test,10);
+
+ if (!tmp || (test[0] != '.' && test[0] != '\0')) {
+ snprintf(connection->errorStr,
+ MPD_BUFFER_MAX_LENGTH,
+ "error parsing version number at "
+ "\"%s\"",
+ &output[strlen(MPD_WELCOME_MESSAGE)]);
+ connection->error = MPD_ERROR_NOTMPD;
+ return 1;
+ }
+ tmp = ++test;
+ }
+
+ return 0;
}
mpd_Connection * mpd_newConnection(const char * host, int port, float timeout) {
int err;
- struct hostent * he;
- struct sockaddr * dest;
-#ifdef HAVE_SOCKLEN_T
- socklen_t destlen;
-#else
- int destlen;
-#endif
- struct sockaddr_in sin;
char * rt;
- char * output;
+ char * output = NULL;
mpd_Connection * connection = malloc(sizeof(mpd_Connection));
struct timeval tv;
fd_set fds;
-#ifdef MPD_HAVE_IPV6
- struct sockaddr_in6 sin6;
-#endif
strcpy(connection->buffer,"");
connection->buflen = 0;
connection->bufstart = 0;
@@ -172,75 +345,13 @@ mpd_Connection * mpd_newConnection(const char * host, int port, float timeout) {
connection->listOks = 0;
connection->doneListOk = 0;
connection->returnElement = NULL;
+ connection->request = NULL;
- if(!(he=gethostbyname(host))) {
- snprintf(connection->errorStr,MPD_BUFFER_MAX_LENGTH,
- "host \"%s\" not found",host);
- connection->error = MPD_ERROR_UNKHOST;
+ if (winsock_dll_error(connection))
return connection;
- }
- memset(&sin,0,sizeof(struct sockaddr_in));
- /*dest.sin_family = he->h_addrtype;*/
- sin.sin_family = AF_INET;
- sin.sin_port = htons(port);
-#ifdef MPD_HAVE_IPV6
- memset(&sin6,0,sizeof(struct sockaddr_in6));
- sin6.sin6_family = AF_INET6;
- sin6.sin6_port = htons(port);
-#endif
- switch(he->h_addrtype) {
- case AF_INET:
- memcpy((char *)&sin.sin_addr.s_addr,(char *)he->h_addr,
- he->h_length);
- dest = (struct sockaddr *)&sin;
- destlen = sizeof(struct sockaddr_in);
- break;
-#ifdef MPD_HAVE_IPV6
- case AF_INET6:
- if(!mpd_ipv6Supported()) {
- strcpy(connection->errorStr,"no IPv6 suuport but a "
- "IPv6 address found\n");
- connection->error = MPD_ERROR_SYSTEM;
- return connection;
- }
- memcpy((char *)&sin6.sin6_addr.s6_addr,(char *)he->h_addr,
- he->h_length);
- dest = (struct sockaddr *)&sin6;
- destlen = sizeof(struct sockaddr_in6);
- break;
-#endif
- default:
- strcpy(connection->errorStr,"address type is not IPv4 or "
- "IPv6\n");
- connection->error = MPD_ERROR_SYSTEM;
- return connection;
- break;
- }
-
- if((connection->sock = socket(dest->sa_family,SOCK_STREAM,0))<0) {
- strcpy(connection->errorStr,"problems creating socket");
- connection->error = MPD_ERROR_SYSTEM;
+ if (mpd_connect(connection, host, port, timeout) < 0)
return connection;
- }
-
- mpd_setConnectionTimeout(connection,timeout);
-
- /* connect stuff */
- {
- int flags = fcntl(connection->sock, F_GETFL, 0);
- fcntl(connection->sock, F_SETFL, flags | O_NONBLOCK);
-
- if(connect(connection->sock,dest,destlen)<0 &&
- errno!=EINPROGRESS)
- {
- snprintf(connection->errorStr,MPD_BUFFER_MAX_LENGTH,
- "problems connecting to \"%s\" on port"
- " %i",host,port);
- connection->error = MPD_ERROR_CONNPORT;
- return connection;
- }
- }
while(!(rt = strstr(connection->buffer,"\n"))) {
tv.tv_sec = connection->timeout.tv_sec;
@@ -250,38 +361,33 @@ mpd_Connection * mpd_newConnection(const char * host, int port, float timeout) {
if((err = select(connection->sock+1,&fds,NULL,NULL,&tv)) == 1) {
int readed;
readed = recv(connection->sock,
- &(connection->buffer[connection->buflen]),
- MPD_BUFFER_MAX_LENGTH-connection->buflen,0);
+ &(connection->buffer[connection->buflen]),
+ MPD_BUFFER_MAX_LENGTH-connection->buflen,0);
if(readed<=0) {
snprintf(connection->errorStr,MPD_BUFFER_MAX_LENGTH,
- "problems getting a response from"
- " \"%s\" on port %i : %s",host,
- port, strerror(errno));
+ "problems getting a response from"
+ " \"%s\" on port %i : %s",host,
+ port, strerror(errno));
connection->error = MPD_ERROR_NORESPONSE;
return connection;
}
connection->buflen+=readed;
connection->buffer[connection->buflen] = '\0';
- tv.tv_sec = connection->timeout.tv_sec;
- tv.tv_usec = connection->timeout.tv_usec;
}
else if(err<0) {
- switch(errno) {
- case EINTR:
+ if (SELECT_ERRNO_IGNORE)
continue;
- default:
- snprintf(connection->errorStr,
+ snprintf(connection->errorStr,
MPD_BUFFER_MAX_LENGTH,
"problems connecting to \"%s\" on port"
- " %i",host,port);
- connection->error = MPD_ERROR_CONNPORT;
- return connection;
- }
+ " %i",host,port);
+ connection->error = MPD_ERROR_CONNPORT;
+ return connection;
}
else {
snprintf(connection->errorStr,MPD_BUFFER_MAX_LENGTH,
- "timeout in attempting to get a response from"
- " \"%s\" on port %i",host,port);
+ "timeout in attempting to get a response from"
+ " \"%s\" on port %i",host,port);
connection->error = MPD_ERROR_NORESPONSE;
return connection;
}
@@ -292,55 +398,10 @@ mpd_Connection * mpd_newConnection(const char * host, int port, float timeout) {
strcpy(connection->buffer,rt+1);
connection->buflen = strlen(connection->buffer);
- if(strncmp(output,MPD_WELCOME_MESSAGE,strlen(MPD_WELCOME_MESSAGE))) {
- free(output);
- snprintf(connection->errorStr,MPD_BUFFER_MAX_LENGTH,
- "mpd not running on port %i on host \"%s\"",
- port,host);
- connection->error = MPD_ERROR_NOTMPD;
- return connection;
- }
-
- {
- char * test;
- char * version[3];
- char * tmp = &output[strlen(MPD_WELCOME_MESSAGE)];
- char * search = ".";
- int i;
-
- for(i=0;i<3;i++) {
- char * tok;
- if(i==3) search = " ";
- version[i] = strtok_r(tmp,search,&tok);
- if(!version[i]) {
- free(output);
- snprintf(connection->errorStr,
- MPD_BUFFER_MAX_LENGTH,
- "error parsing version number at "
- "\"%s\"",
- &output[strlen(MPD_WELCOME_MESSAGE)]);
- connection->error = MPD_ERROR_NOTMPD;
- return connection;
- }
- connection->version[i] = strtol(version[i],&test,10);
- if(version[i]==test || *test!='\0') {
- free(output);
- snprintf(connection->errorStr,
- MPD_BUFFER_MAX_LENGTH,
- "error parsing version number at "
- "\"%s\"",
- &output[strlen(MPD_WELCOME_MESSAGE)]);
- connection->error = MPD_ERROR_NOTMPD;
- return connection;
- }
- tmp = NULL;
- }
- }
+ if(mpd_parseWelcome(connection,host,port,rt,output) == 0) connection->doneProcessing = 1;
free(output);
- connection->doneProcessing = 1;
-
return connection;
}
}
void mpd_closeConnection(mpd_Connection * connection) {
- close(connection->sock);
+ closesocket(connection->sock);
if(connection->returnElement) free(connection->returnElement);
+ if(connection->request) free(connection->request);
free(connection);
+ WSACleanup();
}
-void mpd_executeCommand(mpd_Connection * connection, char * command) {
+static void mpd_executeCommand(mpd_Connection * connection, char * command) {
int ret;
struct timeval tv;
fd_set fds;
tv.tv_sec = connection->timeout.tv_sec;
tv.tv_usec = connection->timeout.tv_usec;
- while((ret = select(connection->sock+1,NULL,&fds,NULL,&tv)==1) ||
- (ret==-1 && errno==EINTR)) {
- ret = send(connection->sock,commandPtr,commandLen,
-#ifdef WIN32
- ioctlsocket(connection->sock, commandLen, commandPtr));
-#endif
-#ifndef WIN32
- MSG_DONTWAIT);
-#endif
+ while((ret = select(connection->sock+1,NULL,&fds,NULL,&tv)==1) ||
+ (ret==-1 && SELECT_ERRNO_IGNORE)) {
+ ret = send(connection->sock,commandPtr,commandLen,MSG_DONTWAIT);
if(ret<=0)
{
- if(ret==EAGAIN || ret==EINTR) continue;
+ if (SENDRECV_ERRNO_IGNORE) continue;
snprintf(connection->errorStr,MPD_BUFFER_MAX_LENGTH,
- "problems giving command \"%s\"",command);
+ "problems giving command \"%s\"",command);
connection->error = MPD_ERROR_SENDING;
return;
}
if(commandLen>0) {
perror("");
snprintf(connection->errorStr,MPD_BUFFER_MAX_LENGTH,
- "timeout sending command \"%s\"",command);
+ "timeout sending command \"%s\"",command);
connection->error = MPD_ERROR_TIMEOUT;
return;
}
}
}
-void mpd_getNextReturnElement(mpd_Connection * connection) {
+static void mpd_getNextReturnElement(mpd_Connection * connection) {
char * output = NULL;
char * rt = NULL;
char * name = NULL;
int readed;
char * bufferCheck = NULL;
int err;
+ int pos;
if(connection->returnElement) mpd_freeReturnElement(connection->returnElement);
connection->returnElement = NULL;
if(connection->doneProcessing || (connection->listOks &&
- connection->doneListOk))
+ connection->doneListOk))
{
strcpy(connection->errorStr,"already done processing current command");
connection->error = 1;
}
bufferCheck = connection->buffer+connection->bufstart;
- while(connection->bufstart>=connection->buflen ||
+ while(connection->bufstart>=connection->buflen ||
!(rt = strchr(bufferCheck,'\n'))) {
if(connection->buflen>=MPD_BUFFER_MAX_LENGTH) {
memmove(connection->buffer,
FD_SET(connection->sock,&fds);
if((err = select(connection->sock+1,&fds,NULL,NULL,&tv) == 1)) {
readed = recv(connection->sock,
- connection->buffer+connection->buflen,
- MPD_BUFFER_MAX_LENGTH-connection->buflen,
-#ifdef WIN32
- ioctlsocket(connection->sock,
- commandLen,
- commandPtr));
-#endif
-#ifndef WIN32
- MSG_DONTWAIT);
-#endif
- if(readed<0 && (errno==EAGAIN || errno==EINTR)) {
+ connection->buffer+connection->buflen,
+ MPD_BUFFER_MAX_LENGTH-connection->buflen,
+ MSG_DONTWAIT);
+ if(readed<0 && SENDRECV_ERRNO_IGNORE) {
continue;
}
if(readed<=0) {
strcpy(connection->errorStr,"connection"
- " closed");
+ " closed");
connection->error = MPD_ERROR_CONNCLOSED;
connection->doneProcessing = 1;
connection->doneListOk = 0;
connection->buflen+=readed;
connection->buffer[connection->buflen] = '\0';
}
- else if(err<0 && errno==EINTR) continue;
+ else if(err<0 && SELECT_ERRNO_IGNORE) continue;
else {
strcpy(connection->errorStr,"connection timeout");
connection->error = MPD_ERROR_TIMEOUT;
if(strcmp(output, "list_OK") == 0) {
if(!connection->listOks) {
- strcpy(connection->errorStr,
+ strcpy(connection->errorStr,
"got an unexpected list_OK");
connection->error = 1;
}
char * test;
char * needle;
int val;
-
+
strcpy(connection->errorStr, output);
connection->error = MPD_ERROR_ACK;
connection->errorCode = MPD_ACK_ERROR_UNK;
return;
}
- name = strtok_r(output,":",&tok);
- if(name && (value = strtok_r(NULL,"",&tok)) && value[0]==' ') {
+ tok = strchr(output, ':');
+ if (!tok) return;
+ pos = tok - output;
+ value = ++tok;
+ name = output;
+ name[pos] = '\0';
+
+ if(value[0]==' ') {
connection->returnElement = mpd_newReturnElement(name,&(value[1]));
}
else {
- if(!name || !value) {
- snprintf(connection->errorStr,MPD_BUFFER_MAX_LENGTH,
- "error parsing: %s",output);
- }
- else {
- snprintf(connection->errorStr,MPD_BUFFER_MAX_LENGTH,
+ snprintf(connection->errorStr,MPD_BUFFER_MAX_LENGTH,
"error parsing: %s:%s",name,value);
- }
connection->errorStr[MPD_BUFFER_MAX_LENGTH] = '\0';
connection->error = 1;
}
}
}
-void mpd_finishListOkCommand(mpd_Connection * connection) {
- while(!connection->doneProcessing && connection->listOks &&
- !connection->doneListOk )
+static void mpd_finishListOkCommand(mpd_Connection * connection) {
+ while(!connection->doneProcessing && connection->listOks &&
+ !connection->doneListOk)
{
mpd_getNextReturnElement(connection);
}
mpd_Status * status;
/*mpd_executeCommand(connection,"status\n");
-
+
if(connection->error) return NULL;*/
- if(connection->doneProcessing || (connection->listOks &&
- connection->doneListOk))
+ if(connection->doneProcessing || (connection->listOks &&
+ connection->doneListOk))
{
return NULL;
}
status->playlistLength = -1;
status->state = -1;
status->song = 0;
+ status->songid = 0;
status->elapsedTime = 0;
status->totalTime = 0;
status->bitRate = 0;
status->songid = atoi(re->value);
}
else if(strcmp(re->name,"time")==0) {
- char * tok;
- char * copy;
- char * temp;
- copy = strdup(re->value);
- temp = strtok_r(copy,":",&tok);
- if(temp) {
- status->elapsedTime = atoi(temp);
- temp = strtok_r(NULL,"",&tok);
- if(temp) status->totalTime = atoi(temp);
+ char * tok = strchr(re->value,':');
+ /* the second strchr below is a safety check */
+ if (tok && (strchr(tok,0) > (tok+1))) {
+ /* atoi stops at the first non-[0-9] char: */
+ status->elapsedTime = atoi(re->value);
+ status->totalTime = atoi(tok+1);
}
- free(copy);
}
else if(strcmp(re->name,"error")==0) {
status->error = strdup(re->value);
status->updatingDb = atoi(re->value);
}
else if(strcmp(re->name,"audio")==0) {
- char * tok;
- char * copy;
- char * temp;
- copy = strdup(re->value);
- temp = strtok_r(copy,":",&tok);
- if(temp) {
- status->sampleRate = atoi(temp);
- temp = strtok_r(NULL,":",&tok);
- if(temp) {
- status->bits = atoi(temp);
- temp = strtok_r(NULL,"",&tok);
- if(temp) status->channels = atoi(temp);
- }
+ char * tok = strchr(re->value,':');
+ if (tok && (strchr(tok,0) > (tok+1))) {
+ status->sampleRate = atoi(re->value);
+ status->bits = atoi(++tok);
+ tok = strchr(tok,':');
+ if (tok && (strchr(tok,0) > (tok+1)))
+ status->channels = atoi(tok+1);
}
- free(copy);
}
mpd_getNextReturnElement(connection);
mpd_Stats * stats;
/*mpd_executeCommand(connection,"stats\n");
-
+
if(connection->error) return NULL;*/
- if(connection->doneProcessing || (connection->listOks &&
- connection->doneListOk))
+ if(connection->doneProcessing || (connection->listOks &&
+ connection->doneListOk))
{
return NULL;
}
free(stats);
}
-void mpd_initSong(mpd_Song * song) {
+static void mpd_initSong(mpd_Song * song) {
song->file = NULL;
song->artist = NULL;
song->album = NULL;
/* added by Qball */
song->genre = NULL;
song->composer = NULL;
+ song->disc = NULL;
+ song->comment = NULL;
song->time = MPD_SONG_NO_TIME;
song->pos = MPD_SONG_NO_NUM;
song->id = MPD_SONG_NO_ID;
}
-void mpd_finishSong(mpd_Song * song) {
+static void mpd_finishSong(mpd_Song * song) {
if(song->file) free(song->file);
if(song->artist) free(song->artist);
if(song->album) free(song->album);
if(song->date) free(song->date);
if(song->genre) free(song->genre);
if(song->composer) free(song->composer);
+ if(song->disc) free(song->disc);
+ if(song->comment) free(song->comment);
}
-mpd_Song * mpd_newSong() {
+mpd_Song * mpd_newSong(void) {
mpd_Song * ret = malloc(sizeof(mpd_Song));
mpd_initSong(ret);
if(song->date) ret->date = strdup(song->date);
if(song->genre) ret->genre= strdup(song->genre);
if(song->composer) ret->composer= strdup(song->composer);
+ if(song->disc) ret->disc = strdup(song->disc);
+ if(song->comment) ret->comment = strdup(song->comment);
ret->time = song->time;
ret->pos = song->pos;
ret->id = song->id;
return ret;
}
-void mpd_initDirectory(mpd_Directory * directory) {
+static void mpd_initDirectory(mpd_Directory * directory) {
directory->path = NULL;
}
-void mpd_finishDirectory(mpd_Directory * directory) {
+static void mpd_finishDirectory(mpd_Directory * directory) {
if(directory->path) free(directory->path);
}
-mpd_Directory * mpd_newDirectory () {
+mpd_Directory * mpd_newDirectory(void) {
mpd_Directory * directory = malloc(sizeof(mpd_Directory));;
mpd_initDirectory(directory);
-
+
return directory;
}
return ret;
}
-void mpd_initPlaylistFile(mpd_PlaylistFile * playlist) {
+static void mpd_initPlaylistFile(mpd_PlaylistFile * playlist) {
playlist->path = NULL;
}
-void mpd_finishPlaylistFile(mpd_PlaylistFile * playlist) {
+static void mpd_finishPlaylistFile(mpd_PlaylistFile * playlist) {
if(playlist->path) free(playlist->path);
}
-mpd_PlaylistFile * mpd_newPlaylistFile() {
+mpd_PlaylistFile * mpd_newPlaylistFile(void) {
mpd_PlaylistFile * playlist = malloc(sizeof(mpd_PlaylistFile));
mpd_initPlaylistFile(playlist);
return ret;
}
-void mpd_initInfoEntity(mpd_InfoEntity * entity) {
+static void mpd_initInfoEntity(mpd_InfoEntity * entity) {
entity->info.directory = NULL;
-}
+}
-void mpd_finishInfoEntity(mpd_InfoEntity * entity) {
+static void mpd_finishInfoEntity(mpd_InfoEntity * entity) {
if(entity->info.directory) {
if(entity->type == MPD_INFO_ENTITY_TYPE_DIRECTORY) {
mpd_freeDirectory(entity->info.directory);
}
}
-mpd_InfoEntity * mpd_newInfoEntity() {
+mpd_InfoEntity * mpd_newInfoEntity(void) {
mpd_InfoEntity * entity = malloc(sizeof(mpd_InfoEntity));
-
+
mpd_initInfoEntity(entity);
return entity;
free(entity);
}
-void mpd_sendInfoCommand(mpd_Connection * connection, char * command) {
+static void mpd_sendInfoCommand(mpd_Connection * connection, char * command) {
mpd_executeCommand(connection,command);
}
mpd_InfoEntity * mpd_getNextInfoEntity(mpd_Connection * connection) {
mpd_InfoEntity * entity = NULL;
- if(connection->doneProcessing || (connection->listOks &&
- connection->doneListOk))
+ if(connection->doneProcessing || (connection->listOks &&
+ connection->doneListOk))
{
return NULL;
}
if(!connection->returnElement) mpd_getNextReturnElement(connection);
- if(connection->returnElement) {
+ if(connection->returnElement) {
if(strcmp(connection->returnElement->name,"file")==0) {
entity = mpd_newInfoEntity();
entity->type = MPD_INFO_ENTITY_TYPE_SONG;
entity->info.song = mpd_newSong();
- entity->info.song->file =
+ entity->info.song->file =
strdup(connection->returnElement->value);
}
else if(strcmp(connection->returnElement->name,
entity = mpd_newInfoEntity();
entity->type = MPD_INFO_ENTITY_TYPE_DIRECTORY;
entity->info.directory = mpd_newDirectory();
- entity->info.directory->path =
+ entity->info.directory->path =
strdup(connection->returnElement->value);
}
else if(strcmp(connection->returnElement->name,"playlist")==0) {
entity = mpd_newInfoEntity();
entity->type = MPD_INFO_ENTITY_TYPE_PLAYLISTFILE;
entity->info.playlistFile = mpd_newPlaylistFile();
- entity->info.playlistFile->path =
+ entity->info.playlistFile->path =
strdup(connection->returnElement->value);
}
+ else if(strcmp(connection->returnElement->name, "cpos") == 0){
+ entity = mpd_newInfoEntity();
+ entity->type = MPD_INFO_ENTITY_TYPE_SONG;
+ entity->info.song = mpd_newSong();
+ entity->info.song->pos = atoi(connection->returnElement->value);
+ }
else {
connection->error = 1;
strcpy(connection->errorStr,"problem parsing song info");
if(strcmp(re->name,"file")==0) return entity;
else if(strcmp(re->name,"directory")==0) return entity;
else if(strcmp(re->name,"playlist")==0) return entity;
+ else if(strcmp(re->name,"cpos")==0) return entity;
- if(entity->type == MPD_INFO_ENTITY_TYPE_SONG &&
+ if(entity->type == MPD_INFO_ENTITY_TYPE_SONG &&
strlen(re->value)) {
if(!entity->info.song->artist &&
strcmp(re->name,"Artist")==0) {
else if(!entity->info.song->composer &&
strcmp(re->name, "Composer") == 0) {
entity->info.song->composer = strdup(re->value);
- }
-
+ }
+ else if(!entity->info.song->disc &&
+ strcmp(re->name, "Disc") == 0) {
+ entity->info.song->disc = strdup(re->value);
+ }
+ else if(!entity->info.song->comment &&
+ strcmp(re->name, "Comment") == 0) {
+ entity->info.song->comment = strdup(re->value);
+ }
}
else if(entity->type == MPD_INFO_ENTITY_TYPE_DIRECTORY) {
}
return entity;
}
-char * mpd_getNextReturnElementNamed(mpd_Connection * connection,
- const char * name)
+static char * mpd_getNextReturnElementNamed(mpd_Connection * connection,
+ const char * name)
{
- if(connection->doneProcessing || (connection->listOks &&
- connection->doneListOk))
+ if(connection->doneProcessing || (connection->listOks &&
+ connection->doneListOk))
{
return NULL;
}
}
return NULL;
}
+
char * mpd_getNextArtist(mpd_Connection * connection) {
return mpd_getNextReturnElementNamed(connection,"Artist");
}
@@ -1130,6 +1192,13 @@ void mpd_sendPlChangesCommand(mpd_Connection * connection, long long playlist) {
free(string);
}
+void mpd_sendPlChangesPosIdCommand(mpd_Connection * connection, long long playlist) {
+ char * string = malloc(strlen("plchangesposid")+25);
+ sprintf(string,"plchangesposid \"%lld\"\n",playlist);
+ mpd_sendInfoCommand(connection,string);
+ free(string);
+}
+
void mpd_sendListallCommand(mpd_Connection * connection, const char * dir) {
char * sDir = mpd_sanitizeArg(dir);
char * string = malloc(strlen("listall")+strlen(sDir)+5);
mpd_executeCommand(connection,"currentsong\n");
}
-void mpd_sendSearchCommand(mpd_Connection * connection, int table,
- const char * str)
+void mpd_sendSearchCommand(mpd_Connection * connection, int table,
+ const char * str)
{
char st[10];
char * string;
free(string);
free(sanitStr);
}
-void mpd_sendSearchTagCommand(mpd_Connection *connection, ...)
-{
- va_list arglist;
- va_start(arglist, connection);
- mpd_sendVSearchTagCommand(connection, arglist);
- va_end(arglist);
-}
-void mpd_sendVSearchTagCommand(mpd_Connection * connection, va_list arglist)
-{
- char *st, *str;
- char * string=NULL;
- int table;
- char * sanitStr;
- string = realloc(string,strlen("search")+1);
- strcpy(string, "search");
- while((table = va_arg(arglist, int)) != -1)
- {
- if(table >= 0 && table < MPD_TAG_NUM_OF_ITEM_TYPES)
- {
- st = mpdTagItemKeys[table];
- str = va_arg(arglist,char *);
- sanitStr = mpd_sanitizeArg(str);
- string = realloc(string, strlen(string)+strlen(st)+strlen(sanitStr)+6);
- sprintf(string, "%s %s \"%s\"",string,st,sanitStr);
- free(sanitStr);
- }
- else {
- connection->error = 1;
- sprintf(connection->errorStr,"unknown table for search %i",table);
- va_end(arglist);
- return;
- }
- }
- /* set the last to '\n', should be sufficient space in the string for this */
- sprintf(string, "%s\n", string);
- mpd_sendInfoCommand(connection,string);
- free(string);
-}
-
-
-void mpd_sendFindTagCommand(mpd_Connection *connection, ...)
-{
- va_list arglist;
- va_start(arglist, connection);
- mpd_sendVFindTagCommand(connection, arglist);
- va_end(arglist);
-}
-
-
-
-
-void mpd_sendVFindTagCommand(mpd_Connection * connection, va_list arglist)
-{
- char *st, *str;
- char * string=NULL;
- int table;
- char * sanitStr;
- string = realloc(string,strlen("find")+1);
- strcpy(string, "find");
- while((table = va_arg(arglist, int)) != -1)
- {
- if(table >= 0 && table < MPD_TAG_NUM_OF_ITEM_TYPES)
- {
- st = mpdTagItemKeys[table];
- str = va_arg(arglist,char *);
- sanitStr = mpd_sanitizeArg(str);
- string = realloc(string, strlen(string)+strlen(st)+strlen(sanitStr)+6);
- sprintf(string, "%s %s \"%s\"",string,st,sanitStr);
- free(sanitStr);
- }
- else {
- connection->error = 1;
- sprintf(connection->errorStr,"unknown table for find %i",table);
- va_end(arglist);
- return;
- }
- }
- /* set the last to '\n', should be sufficient space in the string for this */
- sprintf(string, "%s\n", string);
- mpd_sendInfoCommand(connection,string);
- free(string);
-}
-
-void mpd_sendFindCommand(mpd_Connection * connection, int table,
- const char * str)
+void mpd_sendFindCommand(mpd_Connection * connection, int table,
+ const char * str)
{
char st[10];
char * string;
free(sanitStr);
}
-void mpd_sendListCommand(mpd_Connection * connection, int table,
- const char * arg1)
+void mpd_sendListCommand(mpd_Connection * connection, int table,
+ const char * arg1)
{
char st[10];
char * string;
free(string);
}
-void mpd_sendListTagCommand(mpd_Connection *connection, int ret_table, ...)
-{
- va_list arglist;
- va_start(arglist, ret_table);
- mpd_sendVListTagCommand(connection, ret_table, arglist);
- va_end(arglist);
-}
-void mpd_sendVListTagCommand(mpd_Connection * connection,int ret_table, va_list arglist)
-{
- char *st, *str;
- char * string=NULL;
- int table;
- char * sanitStr;
- if(ret_table < 0 && ret_table >= MPD_TAG_NUM_OF_ITEM_TYPES)
- {
- connection->error = 1;
- sprintf(connection->errorStr,"unknown ret_table for search %i",ret_table);
- return;
- }
-
- string = realloc(string,strlen("list")+3+strlen(mpdTagItemKeys[ret_table]));
- sprintf(string, "list %s",mpdTagItemKeys[ret_table]);
- while((table = va_arg(arglist, int)) != -1)
- {
- if(table >= 0 && table < MPD_TAG_NUM_OF_ITEM_TYPES)
- {
- st = mpdTagItemKeys[table];
- str = va_arg(arglist,char *);
- sanitStr = mpd_sanitizeArg(str);
- string = realloc(string, strlen(string)+strlen(st)+strlen(sanitStr)+7);
- sprintf(string, "%s %s \"%s\"",string,st,sanitStr);
- free(sanitStr);
- }
- else {
- connection->error = 1;
- sprintf(connection->errorStr,"unknown table for search %i",table);
- va_end(arglist);
- return;
- }
- }
- /* set the last to '\n', should be sufficient space in the string for this */
- sprintf(string,"%s\n", string);
- mpd_sendInfoCommand(connection,string);
- free(string);
-}
-
-
void mpd_sendAddCommand(mpd_Connection * connection, const char * file) {
char * sFile = mpd_sanitizeArg(file);
char * string = malloc(strlen("add")+strlen(sFile)+5);
free(output->name);
free(output);
}
+
+/**
+ * mpd_sendNotCommandsCommand
+ * odd naming, but it gets the not allowed commands
+ */
+
+void mpd_sendNotCommandsCommand(mpd_Connection * connection) {
+ mpd_executeCommand(connection,"notcommands\n");
+}
+
+/**
+ * mpd_sendCommandsCommand
+ * odd naming, but it gets the allowed commands
+ */
+
+void mpd_sendCommandsCommand(mpd_Connection * connection) {
+ mpd_executeCommand(connection,"commands\n");
+}
+/**
+ * Get the next returned command
+ */
+char * mpd_getNextCommand(mpd_Connection * connection) {
+ return mpd_getNextReturnElementNamed(connection,"command");
+}
+
+void mpd_startSearch(mpd_Connection * connection,int exact) {
+ if(connection->request) {
+ /* search/find allready in progress */
+ /* TODO: set error here? */
+ return;
+ }
+ if(exact){
+ connection->request = strdup("find");
+ }
+ else{
+ connection->request = strdup("search");
+ }
+}
+
+
+void mpd_startFieldSearch(mpd_Connection * connection,int field) {
+ if(connection->request) {
+ /* search/find allready in progress */
+ /* TODO: set error here? */
+ return;
+ }
+ if(field < 0 || field >= MPD_TAG_NUM_OF_ITEM_TYPES) {
+ /* set error here */
+ return;
+ }
+
+ connection->request = malloc(sizeof(char)*(
+ /* length of the field name */
+ strlen(mpdTagItemKeys[field])+
+ /* "list"+space+\0 */
+ 6
+ ));
+ sprintf(connection->request, "list %s", mpdTagItemKeys[field]);
+}
+
+
+
+void mpd_addConstraintSearch(mpd_Connection *connection,
+ int field,
+ char *name)
+{
+ char *arg = NULL;
+ if(!connection->request){
+ return;
+ }
+ if(name == NULL) {
+ return;
+ }
+ if(field < 0 || field >= MPD_TAG_NUM_OF_ITEM_TYPES) {
+ return;
+ }
+ /* clean up the query */
+ arg = mpd_sanitizeArg(name);
+ /* create space for the query */
+ connection->request = realloc(connection->request, (
+ /* length of the old string */
+ strlen(connection->request)+
+ /* space between */
+ 1+
+ /* length of the field name */
+ strlen(mpdTagItemKeys[field])+
+ /* space plus starting " */
+ 2+
+ /* length of search term */
+ strlen(arg)+
+ /* closign " +\0 that is added sprintf */
+ 2
+ )*sizeof(char));
+ /* and form the query */
+ sprintf(connection->request, "%s %s \"%s\"",
+ connection->request,
+ mpdTagItemKeys[field],
+ arg);
+ free(arg);
+}
+
+
+void mpd_commitSearch(mpd_Connection *connection)
+{
+ if(connection->request)
+ {
+ int length = strlen(connection->request);
+ /* fixing up the string for mpd to like */
+ connection->request = realloc(connection->request,
+ (length+ /* old length */
+ 2 /* closing \n and \0 */
+ )*sizeof(char));
+ connection->request[length] = '\n';
+ connection->request[length+1] = '\0';
+ /* and off we go */
+ mpd_sendInfoCommand(connection, connection->request);
+ /* clean up a bit */
+ free(connection->request);
+ connection->request = NULL;
+ }
+}
+
+/**
+ * @param connection a MpdConnection
+ * @param path the path to the playlist.
+ *
+ * List the content, with full metadata, of a stored playlist.
+ *
+ */
+void mpd_sendListPlaylistInfoCommand(mpd_Connection *connection, char *path)
+{
+ char *arg = mpd_sanitizeArg(path);
+ char *query = malloc(strlen("listplaylistinfo")+strlen(arg)+5);
+ sprintf(query, "listplaylistinfo \"%s\"\n",arg);
+ mpd_sendInfoCommand(connection, query);
+ free(arg);
+ free(query);
+}
+
+/**
+ * @param connection a MpdConnection
+ * @param path the path to the playlist.
+ *
+ * List the content of a stored playlist.
+ *
+ */
+void mpd_sendListPlaylistCommand(mpd_Connection *connection, char *path)
+{
+ char *arg = mpd_sanitizeArg(path);
+ char *query = malloc(strlen("listplaylist")+strlen(arg)+5);
+ sprintf(query, "listplaylist \"%s\"\n",arg);
+ mpd_sendInfoCommand(connection, query);
+ free(arg);
+ free(query);
+}