aniani/elinks
1
0
Fork 0
mirror of https://github.com/rkd77/elinks.git synced 2025-02-02 15:09:23 -05:00
Code

[ftp] done_ftpes function for cleanup

Browse Source
This commit is contained in:
Witold Filipczyk 2023-06-19 21:50:50 +02:00
parent a67188413c
commit c3943a441f
1 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/protocol/curl/ftp.c
View File

@ -366,6 +366,18 @@ progress_callback(void *clientp, curl_off_t dltotal, curl_off_t dlnow, curl_off_
return 0; return 0;
} }
static void
done_ftpes(struct connection *conn)
{
struct ftpes_connection_info *ftp = (struct ftpes_connection_info *)conn->info;
if (!ftp || !ftp->easy) {
return;
}
curl_multi_remove_handle(g.multi, ftp->easy);
curl_easy_cleanup(ftp->easy);
}
static void static void
do_ftpes(struct connection *conn) do_ftpes(struct connection *conn)
{ {
@ -378,6 +390,7 @@ do_ftpes(struct connection *conn)
return; return;
} }
conn->info = ftp; conn->info = ftp;
conn->done = done_ftpes;
if (!conn->uri->datalen || conn->uri->data[conn->uri->datalen - 1] == '/') { if (!conn->uri->datalen || conn->uri->data[conn->uri->datalen - 1] == '/') {
ftp->dir = 1; ftp->dir = 1;
@ -584,26 +597,21 @@ again:
void void
check_multi_info(GlobalInfo *g) check_multi_info(GlobalInfo *g)
{ {
char *eff_url; //char *eff_url;
CURLMsg *msg; CURLMsg *msg;
int msgs_left; int msgs_left;
struct connection *conn; struct connection *conn;
struct ftpes_connection_info *info; //struct ftpes_connection_info *info;
CURL *easy; CURL *easy;
CURLcode res; //CURLcode res;
//fprintf(stderr, "REMAINING: %d\n", g->still_running); //fprintf(stderr, "REMAINING: %d\n", g->still_running);
while ((msg = curl_multi_info_read(g->multi, &msgs_left))) { while ((msg = curl_multi_info_read(g->multi, &msgs_left))) {
if (msg->msg == CURLMSG_DONE) { if (msg->msg == CURLMSG_DONE) {
easy = msg->easy_handle; easy = msg->easy_handle;
res = msg->data.result; //res = msg->data.result;
curl_easy_getinfo(easy, CURLINFO_PRIVATE, &conn); curl_easy_getinfo(easy, CURLINFO_PRIVATE, &conn);
info = (struct ftpes_connection_info *)conn->info;
curl_easy_getinfo(easy, CURLINFO_EFFECTIVE_URL, &eff_url);
//fprintf(stderr, "DONE: %s => (%d) %s\n", eff_url, res, info->error);
curl_multi_remove_handle(g->multi, easy);
curl_easy_cleanup(easy);
abort_connection(conn, connection_state(S_OK)); abort_connection(conn, connection_state(S_OK));
} }
} }
@ -614,13 +622,6 @@ check_multi_info(GlobalInfo *g)
#endif #endif
} }
static void
done_ftpes(struct connection *conn)
{
struct ftpes_connection_info *ftp = (struct ftpes_connection_info *)conn->info;
}
void void
ftpes_protocol_handler(struct connection *conn) ftpes_protocol_handler(struct connection *conn)
{ {