generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use the proper Curl_ourerrno() function instead of plain errno, for better

Browse Source 
portability. Also use Andy Cedilnik's compiler warning fixes.
This commit is contained in:
Daniel Stenberg 2003-05-01 13:36:28 +00:00
parent 078441d477
commit f69ea2c68a
1 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
lib/sendf.c
View File

@ -46,6 +46,7 @@
#include <curl/curl.h> #include <curl/curl.h>
#include "urldata.h" #include "urldata.h"
#include "sendf.h" #include "sendf.h"
#include "connect.h" /* for the Curl_ourerrno() proto */
#define _MPRINTF_REPLACE /* use the internal *printf() functions */ #define _MPRINTF_REPLACE /* use the internal *printf() functions */
#include <curl/mprintf.h> #include <curl/mprintf.h>
@ -228,6 +229,7 @@ CURLcode Curl_write(struct connectdata *conn, int sockfd,
ssize_t *written) ssize_t *written)
{ {
ssize_t bytes_written; ssize_t bytes_written;
(void)conn;
#ifdef USE_SSLEAY #ifdef USE_SSLEAY
/* SSL_write() is said to return 'int' while write() and send() returns /* SSL_write() is said to return 'int' while write() and send() returns
@ -246,7 +248,8 @@ CURLcode Curl_write(struct connectdata *conn, int sockfd,
*written = 0; *written = 0;
return CURLE_OK; return CURLE_OK;
case SSL_ERROR_SYSCALL: case SSL_ERROR_SYSCALL:
failf(conn->data, "SSL_write() returned SYSCALL, errno = %d\n", errno); failf(conn->data, "SSL_write() returned SYSCALL, errno = %d\n",
Curl_ourerrno());
return CURLE_SEND_ERROR; return CURLE_SEND_ERROR;
} }
/* a true error */ /* a true error */
@ -267,14 +270,15 @@ CURLcode Curl_write(struct connectdata *conn, int sockfd,
bytes_written = swrite(sockfd, mem, len); bytes_written = swrite(sockfd, mem, len);
} }
if(-1 == bytes_written) { if(-1 == bytes_written) {
int err = Curl_ourerrno();
#ifdef WIN32 #ifdef WIN32
if(WSAEWOULDBLOCK == GetLastError()) if(WSAEWOULDBLOCK == err)
#else #else
/* As pointed out by Christophe Demory on March 11 2003, errno /* As pointed out by Christophe Demory on March 11 2003, errno
may be EWOULDBLOCK or on some systems EAGAIN when it returned may be EWOULDBLOCK or on some systems EAGAIN when it returned
due to its inability to send off data without blocking. We due to its inability to send off data without blocking. We
therefor treat both error codes the same here */ therefor treat both error codes the same here */
if((EWOULDBLOCK == errno) || (EAGAIN == errno)) if((EWOULDBLOCK == err) || (EAGAIN == err))
#endif #endif
{ {
/* this is just a case of EWOULDBLOCK */ /* this is just a case of EWOULDBLOCK */
@ -345,6 +349,7 @@ int Curl_read(struct connectdata *conn,
ssize_t *n) ssize_t *n)
{ {
ssize_t nread; ssize_t nread;
(void)conn;
*n=0; /* reset amount to zero */ *n=0; /* reset amount to zero */
#ifdef USE_SSLEAY #ifdef USE_SSLEAY
@ -363,6 +368,17 @@ int Curl_read(struct connectdata *conn,
case SSL_ERROR_WANT_WRITE: case SSL_ERROR_WANT_WRITE:
/* there's data pending, re-invoke SSL_read() */ /* there's data pending, re-invoke SSL_read() */
return -1; /* basicly EWOULDBLOCK */ return -1; /* basicly EWOULDBLOCK */
case SSL_ERROR_SYSCALL:
/* openssl/ssl.h says "look at error stack/return value/errno" */
{
char error_buffer[120]; /* OpenSSL documents that this must be at least
120 bytes long. */
int sslerror = ERR_get_error();
failf(conn->data, "SSL read: %s, errno %d",
ERR_error_string(sslerror, error_buffer),
Curl_ourerrno() );
}
return CURLE_RECV_ERROR;
default: default:
failf(conn->data, "SSL read error: %d", err); failf(conn->data, "SSL read error: %d", err);
return CURLE_RECV_ERROR; return CURLE_RECV_ERROR;
@ -379,10 +395,11 @@ int Curl_read(struct connectdata *conn,
nread = sread (sockfd, buf, buffersize); nread = sread (sockfd, buf, buffersize);
if(-1 == nread) { if(-1 == nread) {
int err = Curl_ourerrno();
#ifdef WIN32 #ifdef WIN32
if(WSAEWOULDBLOCK == GetLastError()) if(WSAEWOULDBLOCK == err)
#else #else
if(EWOULDBLOCK == errno) if(EWOULDBLOCK == err)
#endif #endif
return -1; return -1;
} }