From: Kalle Wallin <kaw@linux.se>
Date: Sun, 23 Jan 2005 16:36:15 +0000 (+0000)
Subject: Updated libmpdclient to r2897
X-Git-Tag: v0.12_alpha1~433
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=c12435f8656b2f42cdade1ff4363e12d8d1e07ad;p=ncmpc.git

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 22fe701..83f2c2d 100644
--- 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 2ab4e28..e93b394 100644
--- 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);