DeforaOS/libSystem
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added a comment

Browse Source
This commit is contained in:
Pierre Pronchery 2008-04-17 15:42:13 +00:00
parent b32f6776db
commit 128304d7f9
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/appclient.c
View File

@ -1,5 +1,5 @@
/* $Id$ */ /* $Id$ */
/* Copyright (c) 2007 Pierre Pronchery <khorben@defora.org> */ /* Copyright (c) 2008 Pierre Pronchery <khorben@defora.org> */
/* This file is part of DeforaOS System libSystem */ /* This file is part of DeforaOS System libSystem */
/* libSystem is not free software; you can redistribute it and/or modify it /* libSystem is not free software; you can redistribute it and/or modify it
* under the terms of the Creative Commons Attribution-NonCommercial-ShareAlike * under the terms of the Creative Commons Attribution-NonCommercial-ShareAlike
@ -104,14 +104,13 @@ static int _appclient_read(int fd, AppClient * ac)
assert(len >= 0); assert(len >= 0);
if((len = READ(fd, ac, len)) <= 0) if((len = READ(fd, ac, len)) <= 0)
return _read_error(ac); return _read_error(ac);
ac->buf_read_cnt += len;
#ifdef DEBUG #ifdef DEBUG
fprintf(stderr, "%s%d%s%zd%s", "DEBUG: READ(", fd, ") => ", len, "\n"); fprintf(stderr, "%s%d%s%zd%s", "DEBUG: READ(", fd, ") => ", len, "\n");
#endif #endif
ac->buf_read_cnt += len;
len = appinterface_call_receive(ac->interface, ac->lastret, len = appinterface_call_receive(ac->interface, ac->lastret,
ac->buf_read, ac->buf_read_cnt, ac->lastfunc, ac->buf_read, ac->buf_read_cnt, ac->lastfunc,
ac->lastargs); ac->lastargs);
assert((size_t)len <= ac->buf_read_cnt);
if(len < 0) if(len < 0)
{ {
#ifdef WITH_SSL #ifdef WITH_SSL
@ -121,8 +120,9 @@ static int _appclient_read(int fd, AppClient * ac)
ac->fd = -1; ac->fd = -1;
return _read_unregister(ac); return _read_unregister(ac);
} }
else if(len == 0) /* try again */ else if(len == 0) /* FIXME the buffer may actually be too small */
return 0; return 0;
assert((size_t)len <= ac->buf_read_cnt);
ac->buf_read_cnt -= len; ac->buf_read_cnt -= len;
return _read_unregister(ac); return _read_unregister(ac);
} }