Updated libmpdclient to r2897

git-svn-id: https://svn.musicpd.org/ncmpc/trunk@2898 09075e82-0dd4-0310-85a5-a0d7c8717e4f

diff --git a/ChangeLog b/ChangeLog
index 22fe70103e8c886cc5843202f121bb568ffbd899..83f2c2d8963ce27ec6784a755b824659ee7d1dcd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,12 @@
+2005-01-23: Kalle Wallin <kaw@linux.se>
+       * libmpdclient updated to 2897
+
 2005-01-20: Kalle Wallin <kaw@linux.se>
        * Added French translations from Yann Cézard
 
+2005-01-19: shb
+       * libmpdclient updated to r2890
+
 2005-01-03:  Kalle Wallin <kaw@linux.se>
        * Added Russian translations from Nikolay Pavlov
 

diff --git a/src/libmpdclient.c b/src/libmpdclient.c
index 2ab4e28cfb6ef9a064533097a31cc24f9f95b518..e93b3947e9e4a5804c090a1f4be5bcd7f948be1a 100644 (file)
--- a/src/libmpdclient.c
+++ b/src/libmpdclient.c
@@ -410,14 +410,13 @@ void mpd_getNextReturnElement(mpd_Connection * connection) {
 
        bufferCheck = connection->buffer+connection->bufstart;
        while(connection->bufstart>=connection->buflen || 
-                       !(rt = strstr(bufferCheck,"\n"))) {
+                       !(rt = strchr(bufferCheck,'\n'))) {
                if(connection->buflen>=MPD_BUFFER_MAX_LENGTH) {
                        memmove(connection->buffer,
                                        connection->buffer+
                                        connection->bufstart,
                                        connection->buflen-
                                        connection->bufstart+1);
-                       bufferCheck-=connection->bufstart;
                        connection->buflen-=connection->bufstart;
                        connection->bufstart = 0;
                }
@@ -428,7 +427,7 @@ void mpd_getNextReturnElement(mpd_Connection * connection) {
                        connection->doneListOk = 0;
                        return;
                }
-               bufferCheck+=connection->buflen-connection->bufstart;
+               bufferCheck = connection->buffer+connection->buflen;
                tv.tv_sec = connection->timeout.tv_sec;
                tv.tv_usec = connection->timeout.tv_usec;
                FD_ZERO(&fds);
@@ -438,7 +437,9 @@ void mpd_getNextReturnElement(mpd_Connection * connection) {
                                connection->buffer+connection->buflen,
                                MPD_BUFFER_MAX_LENGTH-connection->buflen,
 #ifdef WIN32
-                          ioctlsocket(connection->sock, commandLen, commandPtr));
+                               ioctlsocket(connection->sock, 
+                                           commandLen, 
+                                           commandPtr));
 #endif
 #ifndef WIN32
                                MSG_DONTWAIT);