mirror
/
darkhttpd
mirror of https://github.com/emikulic/darkhttpd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix signed-unsigned comparison.

This commit is contained in:
Emil Mikulic 2004-12-27 12:40:43 +00:00
parent 5cf2862f08
commit b50b4f1c5a
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
trunk/darkhttpd.c
View File

@ -2052,16 +2052,21 @@ static ssize_t send_from_file(const int s, const int fd,
if (lseek(fd, ofs, SEEK_SET) == -1) err(1, "fseek(%d)", (int)ofs);
numread = read(fd, buf, amount);
if (numread != amount)
if (numread == 0)
{
if (numread == 0)
fprintf(stderr, "premature eof on fd %d\n", fd);
else if (numread != -1)
fprintf(stderr, "read %d bytes, expecting %u bytes on fd %d\n",
numread, amount, fd);
fprintf(stderr, "premature eof on fd %d\n", fd);
return -1;
}
return send(s, buf, amount, 0);
else if (numread != -1)
{
fprintf(stderr, "read %d bytes, expecting %u bytes on fd %d\n",
numread, amount, fd);
return -1;
}
else if ((size_t)numread != amount)
return -1;
else
return send(s, buf, amount, 0);
#endif
#endif
}