oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

fix a few bugs in read()'ing

Browse Source 
git-svn-id: https://svn.musicpd.org/mpd/trunk@2650 09075e82-0dd4-0310-85a5-a0d7c8717e4f
This commit is contained in:
Warren Dukes
2004-11-14 05:54:00 +00:00
parent 86afc13c7e
commit 42b08abe2f
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/interface.c
View File

@@ -43,13 +43,13 @@
#define GREETING "OK MPD" #define GREETING "OK MPD"
#define INTERFACE_MAX_BUFFER_LENGTH MAXPATHLEN+1024 #define INTERFACE_MAX_BUFFER_LENGTH (40960)
#define INTERFACE_LIST_MODE_BEGIN "command_list_begin" #define INTERFACE_LIST_MODE_BEGIN "command_list_begin"
#define INTERFACE_LIST_OK_MODE_BEGIN "command_list_ok_begin" #define INTERFACE_LIST_OK_MODE_BEGIN "command_list_ok_begin"
#define INTERFACE_LIST_MODE_END "command_list_end" #define INTERFACE_LIST_MODE_END "command_list_end"
#define INTERFACE_DEFAULT_OUT_BUFFER_SIZE 4096 #define INTERFACE_DEFAULT_OUT_BUFFER_SIZE (4096)
#define INTERFACE_TIMEOUT_DEFAULT 60 #define INTERFACE_TIMEOUT_DEFAULT (60)
#define INTERFACE_MAX_CONNECTIONS_DEFAULT 10 #define INTERFACE_MAX_CONNECTIONS_DEFAULT (10)
#define INTERFACE_MAX_COMMAND_LIST_DEFAULT (2048*1024) #define INTERFACE_MAX_COMMAND_LIST_DEFAULT (2048*1024)
#define INTERFACE_MAX_OUTPUT_BUFFER_SIZE_DEFAULT (2048*1024) #define INTERFACE_MAX_OUTPUT_BUFFER_SIZE_DEFAULT (2048*1024)
@@ -309,6 +309,7 @@ static int processBytesRead(Interface * interface, int bytesRead) {
if(interface->bufferPos == 0) { if(interface->bufferPos == 0) {
ERROR("interface %i: buffer overflow\n", ERROR("interface %i: buffer overflow\n",
interface->num); interface->num);
closeInterface(interface);
return 1; return 1;
} }
interface->bufferLength-= interface->bufferPos; interface->bufferLength-= interface->bufferPos;
@@ -325,7 +326,7 @@ static int processBytesRead(Interface * interface, int bytesRead) {
int interfaceReadInput(Interface * interface) { int interfaceReadInput(Interface * interface) {
int bytesRead = read(interface->fd, int bytesRead = read(interface->fd,
interface->buffer+interface->bufferLength, interface->buffer+interface->bufferLength,
INTERFACE_MAX_BUFFER_LENGTH-interface->bufferLength+1); INTERFACE_MAX_BUFFER_LENGTH-interface->bufferLength);
if(bytesRead > 0) return processBytesRead(interface, bytesRead); if(bytesRead > 0) return processBytesRead(interface, bytesRead);
else if(bytesRead == 0 && errno!=EINTR) closeInterface(interface); else if(bytesRead == 0 && errno!=EINTR) closeInterface(interface);