aniani/elinks
1
0
Fork 0
mirror of https://github.com/rkd77/elinks.git synced 2024-12-04 14:46:47 -05:00
Code

[ftpes] Check existence of file in blocking way

Browse Source
This commit is contained in:
Witold Filipczyk 2023-06-21 17:24:36 +02:00
parent 5fcc27867d
commit 430c3fea93
1 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -427,9 +427,9 @@ do_ftpes(struct connection *conn)
if (curl) { if (curl) {
CURLMcode rc; CURLMcode rc;
int first_time = 1;
ftp->easy = curl; ftp->easy = curl;
curl_easy_setopt(curl, CURLOPT_URL, u.source);
/* Define our callback to get called when there's data to be written */ /* Define our callback to get called when there's data to be written */
curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, my_fwrite); curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, my_fwrite);
/* Set a pointer to our struct to pass to the callback */ /* Set a pointer to our struct to pass to the callback */
@ -438,6 +438,7 @@ do_ftpes(struct connection *conn)
curl_easy_setopt(curl, CURLOPT_PRIVATE, conn); curl_easy_setopt(curl, CURLOPT_PRIVATE, conn);
curl_easy_setopt(curl, CURLOPT_NOPROGRESS, 1L); curl_easy_setopt(curl, CURLOPT_NOPROGRESS, 1L);
//curl_easy_setopt(curl, CURLOPT_XFERINFODATA, conn); //curl_easy_setopt(curl, CURLOPT_XFERINFODATA, conn);
//curl_easy_setopt(curl, CURLOPT_XFERINFOFUNCTION, progress_callback); //curl_easy_setopt(curl, CURLOPT_XFERINFOFUNCTION, progress_callback);
@ -458,9 +459,25 @@ do_ftpes(struct connection *conn)
//fprintf(stderr, "Adding easy %p to multi %p (%s)\n", curl, g.multi, u.source); //fprintf(stderr, "Adding easy %p to multi %p (%s)\n", curl, g.multi, u.source);
set_connection_state(conn, connection_state(S_TRANS)); set_connection_state(conn, connection_state(S_TRANS));
again:
curl_easy_setopt(curl, CURLOPT_URL, u.source);
curl_easy_setopt(curl, CURLOPT_NOBODY, 0L);
if (!ftp->dir && first_time) {
curl_easy_setopt(curl, CURLOPT_NOBODY, 1L);
CURLcode res = curl_easy_perform(curl);
if (res == CURLE_REMOTE_FILE_NOT_FOUND) {
ftp->dir = 1;
add_char_to_string(&u, '/');
}
first_time = 0;
goto again;
} else {
rc = curl_multi_add_handle(g.multi, curl); rc = curl_multi_add_handle(g.multi, curl);
mcode_or_die("new_conn: curl_multi_add_handle", rc); mcode_or_die("new_conn: curl_multi_add_handle", rc);
} }
}
done_string(&u); done_string(&u);
} }