diff options
author | Alessandro Ghedini <alessandro@ghedini.me> | 2015-06-17 09:38:25 +0200 |
---|---|---|
committer | Alessandro Ghedini <alessandro@ghedini.me> | 2015-06-17 09:38:25 +0200 |
commit | dbada9f3efae6d9d47b24d0fc06b31d5c48e59a9 (patch) | |
tree | 453623e63c0fe6672f0222a33b702b21991c3d85 /lib/telnet.c | |
parent | bff9831a91669600de53ca4ed6022cb212a40b8a (diff) |
Imported Upstream version 7.43.0
Diffstat (limited to 'lib/telnet.c')
-rw-r--r-- | lib/telnet.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/lib/telnet.c b/lib/telnet.c index 91863c06..aabf99d4 100644 --- a/lib/telnet.c +++ b/lib/telnet.c @@ -1423,7 +1423,8 @@ static CURLcode telnet_do(struct connectdata *conn, bool *done) for(;;) { if(data->set.is_fread_set) { /* read from user-supplied method */ - result = (int) conn->fread_func(buf, 1, BUFSIZE - 1, conn->fread_in); + result = (int)data->set.fread_func(buf, 1, BUFSIZE - 1, + data->set.in); if(result == CURL_READFUNC_ABORT) { keepon = FALSE; result = CURLE_READ_ERROR; @@ -1562,13 +1563,13 @@ static CURLcode telnet_do(struct connectdata *conn, bool *done) pfd[0].fd = sockfd; pfd[0].events = POLLIN; - if(conn->fread_func != (curl_read_callback)fread) { + if(data->set.fread_func != (curl_read_callback)fread) { poll_cnt = 1; interval_ms = 100; /* poll user-supplied read function */ } else { /* really using fread, so infile is a FILE* */ - pfd[1].fd = fileno((FILE *)conn->fread_in); + pfd[1].fd = fileno((FILE *)data->set.in); pfd[1].events = POLLIN; poll_cnt = 2; interval_ms = 1 * 1000; @@ -1627,7 +1628,7 @@ static CURLcode telnet_do(struct connectdata *conn, bool *done) } else { /* read from user-supplied method */ - nread = (int)conn->fread_func(buf, 1, BUFSIZE - 1, conn->fread_in); + nread = (int)data->set.fread_func(buf, 1, BUFSIZE - 1, data->set.in); if(nread == CURL_READFUNC_ABORT) { keepon = FALSE; break; |