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

Added output parameter to the get_filesize_from_RETR. It indicates

Browse Source 
whether we ought to add the conn->progress->start to
the conn->est_length. Currently displaying resuming works correctly with
ftp.task.gda.pl and ftp.pld-linux.org.
This commit is contained in:
Witold Filipczyk 2006-08-19 09:11:53 +02:00 committed by Witold Filipczyk
parent 10f2b33360
commit 8615cb529e
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/protocol/ftp/ftp.c
View File

@ -792,7 +792,7 @@ ftp_send_retr_req(struct connection *conn, int state)
/* Parse RETR response and return file size or -1 on error. */ /* Parse RETR response and return file size or -1 on error. */
static off_t static off_t
get_filesize_from_RETR(unsigned char *data, int data_len) get_filesize_from_RETR(unsigned char *data, int data_len, int *resume)
{ {
off_t file_len; off_t file_len;
int pos; int pos;
@ -801,6 +801,7 @@ get_filesize_from_RETR(unsigned char *data, int data_len)
/* Getting file size from text response.. */ /* Getting file size from text response.. */
/* 150 Opening BINARY mode data connection for hello-1.0-1.1.diff.gz (16452 bytes). */ /* 150 Opening BINARY mode data connection for hello-1.0-1.1.diff.gz (16452 bytes). */
*resume = 0;
for (pos = 0; pos < data_len && data[pos] != ASCII_LF; pos++) for (pos = 0; pos < data_len && data[pos] != ASCII_LF; pos++)
if (data[pos] == '(') if (data[pos] == '(')
pos_file_len = pos; pos_file_len = pos;
@ -825,6 +826,7 @@ get_filesize_from_RETR(unsigned char *data, int data_len)
kbytes++; kbytes++;
size = strtod((const char *)kbytes, &endptr); size = strtod((const char *)kbytes, &endptr);
if (endptr == (char *)kbytes) return -1; if (endptr == (char *)kbytes) return -1;
*resume = 1;
return (off_t)(size * 1024.0); return (off_t)(size * 1024.0);
} }
@ -972,14 +974,16 @@ ftp_retr_file(struct socket *socket, struct read_buffer *rb)
* get filesize if needed. */ * get filesize if needed. */
if (!ftp->dir && conn->est_length == -1) { if (!ftp->dir && conn->est_length == -1) {
off_t file_len; off_t file_len;
int res;
file_len = get_filesize_from_RETR(rb->data, rb->length); file_len = get_filesize_from_RETR(rb->data, rb->length, &res);
if (file_len > 0) { if (file_len > 0) {
/* FIXME: ..when downloads resuming /* FIXME: ..when downloads resuming
* implemented.. */ * implemented.. */
/* This is right for vsftpd. /* This is right for vsftpd.
* Show me urls where this is wrong. --witekfl */ * Show me urls where this is wrong. --witekfl */
conn->est_length = file_len; /* + conn->progress->start; */ conn->est_length = res ?
file_len + conn->progress->start : file_len;
} }
} }
} }