ExternalVendorCode/conserver
1
0
Fork 0
mirror of https://github.com/bstansell/conserver.git synced 2025-02-05 10:19:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix #38 - task execution error message

Browse Source
This commit is contained in:
Bryan Stansell 2020-04-30 18:58:56 -07:00
parent 933f3271ad
commit 02d0c15a77
No known key found for this signature in database
GPG Key ID: 28E4B7253029E7F6
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
conserver/cutil.c
View File

@ -890,7 +890,10 @@ FileRead(CONSFILE *cfp, void *buf, int len)
case simpleSocket:
while (retval < 0) {
if ((retval = read(cfp->fd, buf, len)) <= 0) {
if (retval == 0) {
CONDDEBUG((2,
"FileRead(): read(): fd=%d, retval=%d, errno=%d",
cfp->fd, retval, errno));
if (retval == 0 || errno == EIO) {
retval = -1;
break;
}
@ -1067,6 +1070,9 @@ FileWrite(CONSFILE *cfp, FLAG bufferonly, char *buf, int len)
case simpleSocket:
while (len > 0) {
if ((retval = write(fdout, buf, len)) < 0) {
CONDDEBUG((2,
"FileWrite(): write(): fd=%d, retval=%d, errno=%d, len=%d",
fdout, retval, errno, len));
if (errno == EINTR)
continue;
if (errno == EAGAIN) {
@ -1941,11 +1947,11 @@ ProbeInterfaces(in_addr_t bindAddr)
if ((ifc.ifc_len - r) < sizeof(*ifr))
break;
# ifdef HAVE_SA_LEN
# ifdef __FreeBSD__
# ifdef __FreeBSD__
if (sa->sa_len > sizeof(ifr->ifr_addr))
# else
# else
if (sa->sa_len > sizeof(ifr->ifr_ifru))
# endif
# endif
r += sizeof(ifr->ifr_name) + sa->sa_len;
else
# endif