X-Git-Url: http://sjero.net/git/?a=blobdiff_plain;f=src%2Fftp.c;h=46a520ed25897f3c94721c4f224f095437ae633f;hb=319f52d756238aca0ba7c671f529d336757806c5;hp=afc4726665c84001e0963e99b03ca21ee7c0a3fb;hpb=6664409baacff2381b942137ab4fd631012c65ec;p=wget diff --git a/src/ftp.c b/src/ftp.c index afc47266..46a520ed 100644 --- a/src/ftp.c +++ b/src/ftp.c @@ -32,15 +32,10 @@ so, delete this exception statement from your version. */ #include #include -#ifdef HAVE_STRING_H -# include -#else -# include -#endif +#include #ifdef HAVE_UNISTD_H # include #endif -#include #include #include @@ -55,19 +50,13 @@ so, delete this exception statement from your version. */ #include "convert.h" /* for downloaded_file */ #include "recur.h" /* for INFINITE_RECURSION */ -#ifndef errno -extern int errno; -#endif - -extern LARGE_INT total_downloaded_bytes; - /* File where the "ls -al" listing will be saved. */ #define LIST_FILENAME ".listing" extern char ftp_last_respline[]; extern FILE *output_stream; -extern int output_stream_regular; +extern bool output_stream_regular; typedef struct { @@ -221,20 +210,20 @@ ftp_do_port (int csock, int *local_sock) #endif static void -print_length (wgint size, wgint start, int authoritative) +print_length (wgint size, wgint start, bool authoritative) { - logprintf (LOG_VERBOSE, _("Length: %s"), with_thousand_seps (size)); + logprintf (LOG_VERBOSE, _("Length: %s"), number_to_static_string (size)); if (size >= 1024) logprintf (LOG_VERBOSE, " (%s)", human_readable (size)); if (start > 0) { if (start >= 1024) logprintf (LOG_VERBOSE, _(", %s (%s) remaining"), - with_thousand_seps (size - start), + number_to_static_string (size - start), human_readable (size - start)); else logprintf (LOG_VERBOSE, _(", %s remaining"), - with_thousand_seps (size - start)); + number_to_static_string (size - start)); } logputs (LOG_VERBOSE, !authoritative ? _(" (unauthoritative)\n") : "\n"); } @@ -249,11 +238,12 @@ getftp (struct url *u, wgint *len, wgint restval, ccon *con) uerr_t err = RETROK; /* appease the compiler */ FILE *fp; char *user, *passwd, *respline; - char *tms, *tmrate; + char *tms; + const char *tmrate; int cmd = con->cmd; - int pasv_mode_open = 0; + bool pasv_mode_open = false; wgint expected_bytes = 0; - int rest_failed = 0; + bool rest_failed = false; int flags; wgint rd_size; @@ -594,7 +584,7 @@ Error in server response, closing control connection.\n")); else /* do not CWD */ logputs (LOG_VERBOSE, _("==> CWD not required.\n")); - if ((cmd & DO_RETR) && restval && *len == 0) + if ((cmd & DO_RETR) && *len == 0) { if (opt.verbose) { @@ -607,7 +597,7 @@ Error in server response, closing control connection.\n")); switch (err) { case FTPRERR: - case FTPSRVERR : + case FTPSRVERR: logputs (LOG_VERBOSE, "\n"); logputs (LOG_NOTQUIET, _("\ Error in server response, closing control connection.\n")); @@ -621,13 +611,14 @@ Error in server response, closing control connection.\n")); abort (); } if (!opt.server_response) - logputs (LOG_VERBOSE, _("done.\n")); + logprintf (LOG_VERBOSE, *len ? "%s\n" : _("done.\n"), + number_to_static_string (*len)); } /* If anything is to be retrieved, PORT (or PASV) must be sent. */ if (cmd & (DO_LIST | DO_RETR)) { - if (opt.ftp_pasv > 0) + if (opt.ftp_pasv) { ip_address passive_addr; int passive_port; @@ -680,7 +671,7 @@ Error in server response, closing control connection.\n")); ? CONERROR : CONIMPOSSIBLE); } - pasv_mode_open = 1; /* Flag to avoid accept port */ + pasv_mode_open = true; /* Flag to avoid accept port */ if (!opt.server_response) logputs (LOG_VERBOSE, _("done. ")); } /* err==FTP_OK */ @@ -774,7 +765,7 @@ Error in server response, closing control connection.\n")); return err; case FTPRESTFAIL: logputs (LOG_VERBOSE, _("\nREST failed, starting from scratch.\n")); - rest_failed = 1; + rest_failed = true; break; case FTPOK: break; @@ -936,7 +927,7 @@ Error in server response, closing control connection.\n")); fp = fopen (con->target, "wb"); else { - fp = fopen_excl (con->target, 1); + fp = fopen_excl (con->target, true); if (!fp && errno == EEXIST) { /* We cannot just invent a new name and use it (which is @@ -967,11 +958,11 @@ Error in server response, closing control connection.\n")); if (*len) { - print_length (*len, restval, 1); + print_length (*len, restval, true); expected_bytes = *len; /* for get_contents/show_progress */ } else if (expected_bytes) - print_length (expected_bytes, restval, 0); + print_length (expected_bytes, restval, false); /* Get the contents of the document. */ flags = 0; @@ -984,7 +975,9 @@ Error in server response, closing control connection.\n")); restval, &rd_size, len, &con->dltime, flags); tms = time_str (NULL); - tmrate = retr_rate (rd_size, con->dltime, 0); + tmrate = retr_rate (rd_size, con->dltime); + total_download_time += con->dltime; + /* Close data connection socket. */ fd_close (dtsock); fd_close (local_sock); @@ -1101,7 +1094,7 @@ ftp_loop_internal (struct url *u, struct fileinfo *f, ccon *con) int count, orig_lp; wgint restval, len = 0; char *tms, *locf; - char *tmrate = NULL; + const char *tmrate = NULL; uerr_t err; struct_stat st; @@ -1111,7 +1104,7 @@ ftp_loop_internal (struct url *u, struct fileinfo *f, ccon *con) if (opt.noclobber && file_exists_p (con->target)) { logprintf (LOG_VERBOSE, - _("File `%s' already there, not retrieving.\n"), con->target); + _("File `%s' already there; not retrieving.\n"), con->target); /* If the file is there, we suppose it's retrieved OK. */ return RETROK; } @@ -1158,20 +1151,24 @@ ftp_loop_internal (struct url *u, struct fileinfo *f, ccon *con) } /* Decide whether or not to restart. */ - restval = 0; - if (count > 1) - restval = len; /* start where the previous run left off */ - else if (opt.always_rest - && stat (locf, &st) == 0 - && S_ISREG (st.st_mode)) + if (opt.always_rest + && stat (locf, &st) == 0 + && S_ISREG (st.st_mode)) + /* When -c is used, continue from on-disk size. (Can't use + hstat.len even if count>1 because we don't want a failed + first attempt to clobber existing data.) */ restval = st.st_size; + else if (count > 1) + restval = len; /* start where the previous run left off */ + else + restval = 0; /* Get the current time string. */ tms = time_str (NULL); /* Print fetch message, if opt.verbose. */ if (opt.verbose) { - char *hurl = url_string (u, 1); + char *hurl = url_string (u, true); char tmp[256]; strcpy (tmp, " "); if (count > 1) @@ -1233,7 +1230,7 @@ ftp_loop_internal (struct url *u, struct fileinfo *f, ccon *con) } tms = time_str (NULL); if (!opt.spider) - tmrate = retr_rate (len - restval, con->dltime, 0); + tmrate = retr_rate (len - restval, con->dltime); /* If we get out of the switch above without continue'ing, we've successfully downloaded a file. Remember this fact. */ @@ -1252,7 +1249,7 @@ ftp_loop_internal (struct url *u, struct fileinfo *f, ccon *con) /* Need to hide the password from the URL. The `if' is here so that we don't do the needless allocation every time. */ - char *hurl = url_string (u, 1); + char *hurl = url_string (u, true); logprintf (LOG_NONVERBOSE, "%s URL: %s [%s] -> \"%s\" [%d]\n", tms, hurl, number_to_static_string (len), locf, count); xfree (hurl); @@ -1351,12 +1348,10 @@ ftp_get_listing (struct url *u, ccon *con, struct fileinfo **f) return err; } -static uerr_t ftp_retrieve_dirs PARAMS ((struct url *, struct fileinfo *, - ccon *)); -static uerr_t ftp_retrieve_glob PARAMS ((struct url *, ccon *, int)); -static struct fileinfo *delelement PARAMS ((struct fileinfo *, - struct fileinfo **)); -static void freefileinfo PARAMS ((struct fileinfo *f)); +static uerr_t ftp_retrieve_dirs (struct url *, struct fileinfo *, ccon *); +static uerr_t ftp_retrieve_glob (struct url *, ccon *, int); +static struct fileinfo *delelement (struct fileinfo *, struct fileinfo **); +static void freefileinfo (struct fileinfo *f); /* Retrieve a list of files given in struct fileinfo linked list. If a file is a symbolic link, do not retrieve it, but rather try to @@ -1373,7 +1368,7 @@ ftp_retrieve_list (struct url *u, struct fileinfo *f, ccon *con) struct fileinfo *orig; wgint local_size; time_t tml; - int dlthis; + bool dlthis; /* Increase the depth. */ ++depth; @@ -1419,7 +1414,7 @@ ftp_retrieve_list (struct url *u, struct fileinfo *f, ccon *con) con->target = url_file_name (u); err = RETROK; - dlthis = 1; + dlthis = true; if (opt.timestamping && f->type == FT_PLAINFILE) { struct_stat st; @@ -1430,8 +1425,8 @@ ftp_retrieve_list (struct url *u, struct fileinfo *f, ccon *con) .orig suffix. */ if (!stat (con->target, &st)) { - int eq_size; - int cor_val; + bool eq_size; + bool cor_val; /* Else, get it from the file. */ local_size = st.st_size; tml = st.st_mtime; @@ -1444,14 +1439,14 @@ ftp_retrieve_list (struct url *u, struct fileinfo *f, ccon *con) values. Assumme sizes being equal for servers that lie about file size. */ cor_val = (con->rs == ST_UNIX || con->rs == ST_WINNT); - eq_size = cor_val ? (local_size == f->size) : 1 ; + eq_size = cor_val ? (local_size == f->size) : true; if (f->tstamp <= tml && eq_size) { /* Remote file is older, file sizes can be compared and are both equal. */ logprintf (LOG_VERBOSE, _("\ Remote file no newer than local file `%s' -- not retrieving.\n"), con->target); - dlthis = 0; + dlthis = false; } else if (eq_size) { @@ -1501,7 +1496,7 @@ The sizes do not match (local %s) -- retrieving.\n\n"), logprintf (LOG_VERBOSE, _("\ Already have correct symlink %s -> %s\n\n"), con->target, escnonprint (f->linkto)); - dlthis = 0; + dlthis = false; break; } } @@ -1666,17 +1661,17 @@ Not descending to `%s' as it is excluded/not-included.\n"), return RETROK; } -/* Return non-zero if S has a leading '/' or contains '../' */ -static int +/* Return true if S has a leading '/' or contains '../' */ +static bool has_insecure_name_p (const char *s) { if (*s == '/') - return 1; + return true; if (strstr (s, "../") != 0) - return 1; + return true; - return 0; + return false; } /* A near-top-level function to retrieve the files in a directory. @@ -1849,7 +1844,7 @@ ftp_loop (struct url *u, int *dt, struct url *proxy) } else { - int ispattern = 0; + bool ispattern = false; if (opt.ftp_glob) { /* Treat the URL as a pattern if the file name part of the