mirror of
https://github.com/bobbimanners/emailler.git
synced 2024-06-08 00:29:29 +00:00
NNTP65/POP65: Minor cleanup of error handling code.
This commit is contained in:
parent
1f5f193657
commit
5c855c825e
|
@ -232,7 +232,7 @@ bool w5100_tcp_send_recv(char* sendbuf, char* recvbuf, size_t length,
|
|||
written = fwrite(recvbuf + 4, 1, len, fp);
|
||||
if (written != len) {
|
||||
printf("Write error");
|
||||
error_exit();
|
||||
return false;
|
||||
}
|
||||
|
||||
// Copy 4 bytes of overlap
|
||||
|
@ -265,12 +265,21 @@ bool w5100_tcp_send_recv(char* sendbuf, char* recvbuf, size_t length,
|
|||
continue;
|
||||
}
|
||||
|
||||
if (rcv == 0) {
|
||||
if (strncmp(sendbuf, "QUIT\r\n", 6) == 0)
|
||||
return true; // This can happen on QUIT. It's okay.
|
||||
else {
|
||||
printf("Something bad\n");
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
if (rcv > length - len)
|
||||
rcv = length - len;
|
||||
|
||||
if (rcv == 0) {
|
||||
printf("Buffer overflow\n"); // Should never happen
|
||||
error_exit();
|
||||
printf("Buffer overflow\n");
|
||||
return false;
|
||||
}
|
||||
|
||||
{
|
||||
|
|
16
apps/pop65.c
16
apps/pop65.c
|
@ -227,7 +227,7 @@ bool w5100_tcp_send_recv(char* sendbuf, char* recvbuf, size_t length,
|
|||
if (written != len) {
|
||||
printf("Write error");
|
||||
fclose(fp);
|
||||
error_exit();
|
||||
return false;
|
||||
}
|
||||
|
||||
// Copy 4 bytes of overlap
|
||||
|
@ -260,13 +260,21 @@ bool w5100_tcp_send_recv(char* sendbuf, char* recvbuf, size_t length,
|
|||
continue;
|
||||
}
|
||||
|
||||
if (rcv == 0) {
|
||||
if (strncmp(sendbuf, "QUIT\r\n", 6) == 0)
|
||||
return true; // This can happen on QUIT. It's okay.
|
||||
else {
|
||||
printf("Something bad\n");
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
if (rcv > length - len)
|
||||
rcv = length - len;
|
||||
|
||||
if (rcv == 0) {
|
||||
return true; // This can happen on the final QUIT
|
||||
// printf("Buffer overflow\n"); // Should never happen
|
||||
// error_exit();
|
||||
printf("Buffer overflow\n");
|
||||
return false;
|
||||
}
|
||||
|
||||
{
|
||||
|
|
Loading…
Reference in New Issue
Block a user