X-Git-Url: http://sjero.net/git/?a=blobdiff_plain;f=src%2Fftp.c;h=46a520ed25897f3c94721c4f224f095437ae633f;hb=319f52d756238aca0ba7c671f529d336757806c5;hp=873556aaeb9b2c4b0ebf9c3d60670281e45cceaa;hpb=0716c335a0d38c09ade6f05be17bffa0d586b3da;p=wget diff --git a/src/ftp.c b/src/ftp.c index 873556aa..46a520ed 100644 --- a/src/ftp.c +++ b/src/ftp.c @@ -32,22 +32,16 @@ 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 #include "wget.h" #include "utils.h" #include "url.h" -#include "rbuf.h" #include "retr.h" #include "ftp.h" #include "connect.h" @@ -56,22 +50,19 @@ 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 bool output_stream_regular; + typedef struct { int st; /* connection status */ int cmd; /* command code */ - struct rbuf rbuf; /* control connection buffer */ + int csock; /* control connection socket */ double dltime; /* time of the download in msecs */ enum stype rs; /* remote system reported by ftp server */ char *id; /* initial directory */ @@ -81,12 +72,12 @@ typedef struct /* Look for regexp "( *[0-9]+ *byte" (literal parenthesis) anywhere in - the string S, and return the number converted to long, if found, 0 + the string S, and return the number converted to wgint, if found, 0 otherwise. */ -static long +static wgint ftp_expected_bytes (const char *s) { - long res; + wgint res; while (1) { @@ -94,18 +85,8 @@ ftp_expected_bytes (const char *s) ++s; if (!*s) return 0; - for (++s; *s && ISSPACE (*s); s++); - if (!*s) - return 0; - if (!ISDIGIT (*s)) - continue; - res = 0; - do - { - res = (*s - '0') + 10 * res; - ++s; - } - while (*s && ISDIGIT (*s)); + ++s; /* skip the '(' */ + res = str_to_wgint (s, (char **) &s, 10); if (!*s) return 0; while (*s && ISSPACE (*s)) @@ -128,14 +109,14 @@ ftp_expected_bytes (const char *s) * It is merely a wrapper around ftp_epsv, ftp_lpsv and ftp_pasv. */ static uerr_t -ftp_do_pasv (struct rbuf *rbuf, ip_address *addr, int *port) +ftp_do_pasv (int csock, ip_address *addr, int *port) { uerr_t err; /* We need to determine the address family and need to call getpeername, so while we're at it, store the address to ADDR. ftp_pasv and ftp_lpsv can simply override it. */ - if (!socket_ip_address (RBUF_FD (rbuf), addr, ENDPOINT_PEER)) + if (!socket_ip_address (csock, addr, ENDPOINT_PEER)) abort (); /* If our control connection is over IPv6, then we first try EPSV and then @@ -146,19 +127,19 @@ ftp_do_pasv (struct rbuf *rbuf, ip_address *addr, int *port) case IPV4_ADDRESS: if (!opt.server_response) logputs (LOG_VERBOSE, "==> PASV ... "); - err = ftp_pasv (rbuf, addr, port); + err = ftp_pasv (csock, addr, port); break; case IPV6_ADDRESS: if (!opt.server_response) logputs (LOG_VERBOSE, "==> EPSV ... "); - err = ftp_epsv (rbuf, addr, port); + err = ftp_epsv (csock, addr, port); /* If EPSV is not supported try LPSV */ if (err == FTPNOPASV) { if (!opt.server_response) logputs (LOG_VERBOSE, "==> LPSV ... "); - err = ftp_lpsv (rbuf, addr, port); + err = ftp_lpsv (csock, addr, port); } break; default: @@ -173,15 +154,12 @@ ftp_do_pasv (struct rbuf *rbuf, ip_address *addr, int *port) * It is merely a wrapper around ftp_eprt, ftp_lprt and ftp_port. */ static uerr_t -ftp_do_port (struct rbuf *rbuf, int *local_sock) +ftp_do_port (int csock, int *local_sock) { uerr_t err; ip_address cip; - assert (rbuf != NULL); - assert (rbuf_initialized_p (rbuf)); - - if (!socket_ip_address (RBUF_FD (rbuf), &cip, ENDPOINT_PEER)) + if (!socket_ip_address (csock, &cip, ENDPOINT_PEER)) abort (); /* If our control connection is over IPv6, then we first try EPRT and then @@ -192,19 +170,19 @@ ftp_do_port (struct rbuf *rbuf, int *local_sock) case IPV4_ADDRESS: if (!opt.server_response) logputs (LOG_VERBOSE, "==> PORT ... "); - err = ftp_port (rbuf, local_sock); + err = ftp_port (csock, local_sock); break; case IPV6_ADDRESS: if (!opt.server_response) logputs (LOG_VERBOSE, "==> EPRT ... "); - err = ftp_eprt (rbuf, local_sock); + err = ftp_eprt (csock, local_sock); /* If EPRT is not supported try LPRT */ if (err == FTPPORTERR) { if (!opt.server_response) logputs (LOG_VERBOSE, "==> LPRT ... "); - err = ftp_lprt (rbuf, local_sock); + err = ftp_lprt (csock, local_sock); } break; default: @@ -215,36 +193,59 @@ ftp_do_port (struct rbuf *rbuf, int *local_sock) #else static uerr_t -ftp_do_pasv (struct rbuf *rbuf, ip_address *addr, int *port) +ftp_do_pasv (int csock, ip_address *addr, int *port) { if (!opt.server_response) logputs (LOG_VERBOSE, "==> PASV ... "); - return ftp_pasv (rbuf, addr, port); + return ftp_pasv (csock, addr, port); } static uerr_t -ftp_do_port (struct rbuf *rbuf, int *local_sock) +ftp_do_port (int csock, int *local_sock) { if (!opt.server_response) logputs (LOG_VERBOSE, "==> PORT ... "); - return ftp_port (rbuf, local_sock); + return ftp_port (csock, local_sock); } #endif +static void +print_length (wgint size, wgint start, bool authoritative) +{ + 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"), + number_to_static_string (size - start), + human_readable (size - start)); + else + logprintf (LOG_VERBOSE, _(", %s remaining"), + number_to_static_string (size - start)); + } + logputs (LOG_VERBOSE, !authoritative ? _(" (unauthoritative)\n") : "\n"); +} + /* Retrieves a file with denoted parameters through opening an FTP connection to the server. It always closes the data connection, and closes the control connection in case of error. */ static uerr_t -getftp (struct url *u, long *len, long restval, ccon *con) +getftp (struct url *u, wgint *len, wgint restval, ccon *con) { int csock, dtsock, local_sock, res; - uerr_t err; + 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; - long expected_bytes = 0L; + bool pasv_mode_open = false; + wgint expected_bytes = 0; + bool rest_failed = false; + int flags; + wgint rd_size; assert (con != NULL); assert (con->target != NULL); @@ -259,16 +260,17 @@ getftp (struct url *u, long *len, long restval, ccon *con) user = u->user; passwd = u->passwd; search_netrc (u->host, (const char **)&user, (const char **)&passwd, 1); - user = user ? user : opt.ftp_acc; - passwd = passwd ? passwd : opt.ftp_pass; - assert (user && passwd); + user = user ? user : (opt.ftp_user ? opt.ftp_user : opt.user); + if (!user) user = "anonymous"; + passwd = passwd ? passwd : (opt.ftp_passwd ? opt.ftp_passwd : opt.passwd); + if (!passwd) passwd = "-wget@"; dtsock = -1; local_sock = -1; con->dltime = 0; if (!(cmd & DO_LOGIN)) - csock = RBUF_FD (&con->rbuf); + csock = con->csock; else /* cmd & DO_LOGIN */ { char type_char; @@ -279,8 +281,7 @@ getftp (struct url *u, long *len, long restval, ccon *con) if (con->proxy) { /* If proxy is in use, log in as username@target-site. */ - logname = xmalloc (strlen (user) + 1 + strlen (u->host) + 1); - sprintf (logname, "%s@%s", user, u->host); + logname = concat_strings (user, "@", u->host, (char *) 0); } /* Login to the server: */ @@ -295,19 +296,15 @@ getftp (struct url *u, long *len, long restval, ccon *con) ? CONERROR : CONIMPOSSIBLE); if (cmd & LEAVE_PENDING) - rbuf_initialize (&con->rbuf, csock); + con->csock = csock; else - rbuf_uninitialize (&con->rbuf); - - /* Since this is a new connection, we may safely discard - anything left in the buffer. */ - rbuf_discard (&con->rbuf); + con->csock = -1; /* Second: Login with proper USER/PASS sequence. */ - logprintf (LOG_VERBOSE, _("Logging in as %s ... "), user); + logprintf (LOG_VERBOSE, _("Logging in as %s ... "), escnonprint (user)); if (opt.server_response) logputs (LOG_ALWAYS, "\n"); - err = ftp_login (&con->rbuf, logname, passwd); + err = ftp_login (csock, logname, passwd); if (con->proxy) xfree (logname); @@ -320,51 +317,44 @@ getftp (struct url *u, long *len, long restval, ccon *con) logputs (LOG_NOTQUIET, _("\ Error in server response, closing control connection.\n")); fd_close (csock); - rbuf_uninitialize (&con->rbuf); + con->csock = -1; return err; - break; case FTPSRVERR: logputs (LOG_VERBOSE, "\n"); logputs (LOG_NOTQUIET, _("Error in server greeting.\n")); fd_close (csock); - rbuf_uninitialize (&con->rbuf); + con->csock = -1; return err; - break; case WRITEFAILED: logputs (LOG_VERBOSE, "\n"); logputs (LOG_NOTQUIET, _("Write failed, closing control connection.\n")); fd_close (csock); - rbuf_uninitialize (&con->rbuf); + con->csock = -1; return err; - break; case FTPLOGREFUSED: logputs (LOG_VERBOSE, "\n"); logputs (LOG_NOTQUIET, _("The server refuses login.\n")); fd_close (csock); - rbuf_uninitialize (&con->rbuf); + con->csock = -1; return FTPLOGREFUSED; - break; case FTPLOGINC: logputs (LOG_VERBOSE, "\n"); logputs (LOG_NOTQUIET, _("Login incorrect.\n")); fd_close (csock); - rbuf_uninitialize (&con->rbuf); + con->csock = -1; return FTPLOGINC; - break; case FTPOK: if (!opt.server_response) logputs (LOG_VERBOSE, _("Logged in!\n")); break; default: abort (); - exit (1); - break; } /* Third: Get the system type */ if (!opt.server_response) logprintf (LOG_VERBOSE, "==> SYST ... "); - err = ftp_syst (&con->rbuf, &con->rs); + err = ftp_syst (csock, &con->rs); /* FTPRERR */ switch (err) { @@ -373,9 +363,8 @@ Error in server response, closing control connection.\n")); logputs (LOG_NOTQUIET, _("\ Error in server response, closing control connection.\n")); fd_close (csock); - rbuf_uninitialize (&con->rbuf); + con->csock = -1; return err; - break; case FTPSRVERR: logputs (LOG_VERBOSE, "\n"); logputs (LOG_NOTQUIET, @@ -386,7 +375,6 @@ Error in server response, closing control connection.\n")); break; default: abort (); - break; } if (!opt.server_response && err != FTPSRVERR) logputs (LOG_VERBOSE, _("done. ")); @@ -395,7 +383,7 @@ Error in server response, closing control connection.\n")); if (!opt.server_response) logprintf (LOG_VERBOSE, "==> PWD ... "); - err = ftp_pwd(&con->rbuf, &con->id); + err = ftp_pwd (csock, &con->id); /* FTPRERR */ switch (err) { @@ -404,9 +392,8 @@ Error in server response, closing control connection.\n")); logputs (LOG_NOTQUIET, _("\ Error in server response, closing control connection.\n")); fd_close (csock); - rbuf_uninitialize (&con->rbuf); + con->csock = -1; return err; - break; case FTPSRVERR : /* PWD unsupported -- assume "/". */ xfree_null (con->id); @@ -417,7 +404,6 @@ Error in server response, closing control connection.\n")); break; default: abort (); - break; } /* VMS will report something like "PUB$DEVICE:[INITIAL.FOLDER]". Convert it to "/INITIAL/FOLDER" */ @@ -449,7 +435,7 @@ Error in server response, closing control connection.\n")); type_char = ftp_process_type (u->params); if (!opt.server_response) logprintf (LOG_VERBOSE, "==> TYPE %c ... ", type_char); - err = ftp_type (&con->rbuf, type_char); + err = ftp_type (csock, type_char); /* FTPRERR, WRITEFAILED, FTPUNKNOWNTYPE */ switch (err) { @@ -458,31 +444,28 @@ Error in server response, closing control connection.\n")); logputs (LOG_NOTQUIET, _("\ Error in server response, closing control connection.\n")); fd_close (csock); - rbuf_uninitialize (&con->rbuf); + con->csock = -1; return err; - break; case WRITEFAILED: logputs (LOG_VERBOSE, "\n"); logputs (LOG_NOTQUIET, _("Write failed, closing control connection.\n")); fd_close (csock); - rbuf_uninitialize (&con->rbuf); + con->csock = -1; return err; - break; case FTPUNKNOWNTYPE: logputs (LOG_VERBOSE, "\n"); logprintf (LOG_NOTQUIET, _("Unknown type `%c', closing control connection.\n"), type_char); fd_close (csock); - rbuf_uninitialize (&con->rbuf); + con->csock = -1; return err; case FTPOK: /* Everything is OK. */ break; default: abort (); - break; } if (!opt.server_response) logputs (LOG_VERBOSE, _("done. ")); @@ -563,8 +546,8 @@ Error in server response, closing control connection.\n")); } if (!opt.server_response) - logprintf (LOG_VERBOSE, "==> CWD %s ... ", target); - err = ftp_cwd (&con->rbuf, target); + logprintf (LOG_VERBOSE, "==> CWD %s ... ", escnonprint (target)); + err = ftp_cwd (csock, target); /* FTPRERR, WRITEFAILED, FTPNSFOD */ switch (err) { @@ -573,31 +556,26 @@ Error in server response, closing control connection.\n")); logputs (LOG_NOTQUIET, _("\ Error in server response, closing control connection.\n")); fd_close (csock); - rbuf_uninitialize (&con->rbuf); + con->csock = -1; return err; - break; case WRITEFAILED: logputs (LOG_VERBOSE, "\n"); logputs (LOG_NOTQUIET, _("Write failed, closing control connection.\n")); fd_close (csock); - rbuf_uninitialize (&con->rbuf); + con->csock = -1; return err; - break; case FTPNSFOD: logputs (LOG_VERBOSE, "\n"); logprintf (LOG_NOTQUIET, _("No such directory `%s'.\n\n"), - u->dir); + escnonprint (u->dir)); fd_close (csock); - rbuf_uninitialize (&con->rbuf); + con->csock = -1; return err; - break; case FTPOK: - /* fine and dandy */ break; default: abort (); - break; } if (!opt.server_response) logputs (LOG_VERBOSE, _("done.\n")); @@ -606,46 +584,45 @@ 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) { if (!opt.server_response) - logprintf (LOG_VERBOSE, "==> SIZE %s ... ", u->file); + logprintf (LOG_VERBOSE, "==> SIZE %s ... ", escnonprint (u->file)); } - err = ftp_size(&con->rbuf, u->file, len); + err = ftp_size (csock, u->file, len); /* FTPRERR */ switch (err) { case FTPRERR: - case FTPSRVERR : + case FTPSRVERR: logputs (LOG_VERBOSE, "\n"); logputs (LOG_NOTQUIET, _("\ Error in server response, closing control connection.\n")); fd_close (csock); - rbuf_uninitialize (&con->rbuf); + con->csock = -1; return err; - break; case FTPOK: /* Everything is OK. */ break; default: abort (); - break; } 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; - err = ftp_do_pasv (&con->rbuf, &passive_addr, &passive_port); + err = ftp_do_pasv (csock, &passive_addr, &passive_port); /* FTPRERR, WRITEFAILED, FTPNOPASV, FTPINVPASV */ switch (err) { @@ -654,17 +631,15 @@ Error in server response, closing control connection.\n")); logputs (LOG_NOTQUIET, _("\ Error in server response, closing control connection.\n")); fd_close (csock); - rbuf_uninitialize (&con->rbuf); + con->csock = -1; return err; - break; case WRITEFAILED: logputs (LOG_VERBOSE, "\n"); logputs (LOG_NOTQUIET, _("Write failed, closing control connection.\n")); fd_close (csock); - rbuf_uninitialize (&con->rbuf); + con->csock = -1; return err; - break; case FTPNOPASV: logputs (LOG_VERBOSE, "\n"); logputs (LOG_NOTQUIET, _("Cannot initiate PASV transfer.\n")); @@ -674,12 +649,10 @@ Error in server response, closing control connection.\n")); logputs (LOG_NOTQUIET, _("Cannot parse PASV response.\n")); break; case FTPOK: - /* fine and dandy */ break; default: abort (); - break; - } /* switch(err) */ + } /* switch (err) */ if (err==FTPOK) { DEBUGP (("trying to connect to %s port %d\n", @@ -690,15 +663,15 @@ Error in server response, closing control connection.\n")); { int save_errno = errno; fd_close (csock); - rbuf_uninitialize (&con->rbuf); - logprintf (LOG_VERBOSE, _("couldn't connect to %s port %hu: %s\n"), + con->csock = -1; + logprintf (LOG_VERBOSE, _("couldn't connect to %s port %d: %s\n"), pretty_print_address (&passive_addr), passive_port, strerror (save_errno)); return (retryable_socket_connect_error (save_errno) ? 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 */ @@ -706,7 +679,7 @@ Error in server response, closing control connection.\n")); if (!pasv_mode_open) /* Try to use a port command if PASV failed */ { - err = ftp_do_port (&con->rbuf, &local_sock); + err = ftp_do_port (csock, &local_sock); /* FTPRERR, WRITEFAILED, bindport (FTPSYSERR), HOSTERR, FTPPORTERR */ switch (err) @@ -716,52 +689,45 @@ Error in server response, closing control connection.\n")); logputs (LOG_NOTQUIET, _("\ Error in server response, closing control connection.\n")); fd_close (csock); + con->csock = -1; fd_close (dtsock); fd_close (local_sock); - rbuf_uninitialize (&con->rbuf); return err; - break; case WRITEFAILED: logputs (LOG_VERBOSE, "\n"); logputs (LOG_NOTQUIET, _("Write failed, closing control connection.\n")); fd_close (csock); + con->csock = -1; fd_close (dtsock); fd_close (local_sock); - rbuf_uninitialize (&con->rbuf); return err; - break; case CONSOCKERR: logputs (LOG_VERBOSE, "\n"); logprintf (LOG_NOTQUIET, "socket: %s\n", strerror (errno)); fd_close (csock); + con->csock = -1; fd_close (dtsock); fd_close (local_sock); - rbuf_uninitialize (&con->rbuf); return err; - break; case FTPSYSERR: logputs (LOG_VERBOSE, "\n"); logprintf (LOG_NOTQUIET, _("Bind error (%s).\n"), strerror (errno)); fd_close (dtsock); return err; - break; case FTPPORTERR: logputs (LOG_VERBOSE, "\n"); logputs (LOG_NOTQUIET, _("Invalid PORT.\n")); fd_close (csock); + con->csock = -1; fd_close (dtsock); fd_close (local_sock); - rbuf_uninitialize (&con->rbuf); return err; - break; case FTPOK: - /* fine and dandy */ break; default: abort (); - break; } /* port switch */ if (!opt.server_response) logputs (LOG_VERBOSE, _("done. ")); @@ -772,8 +738,9 @@ Error in server response, closing control connection.\n")); if (restval && (cmd & DO_RETR)) { if (!opt.server_response) - logprintf (LOG_VERBOSE, "==> REST %ld ... ", restval); - err = ftp_rest (&con->rbuf, restval); + logprintf (LOG_VERBOSE, "==> REST %s ... ", + number_to_static_string (restval)); + err = ftp_rest (csock, restval); /* FTPRERR, WRITEFAILED, FTPRESTFAIL */ switch (err) @@ -783,45 +750,27 @@ Error in server response, closing control connection.\n")); logputs (LOG_NOTQUIET, _("\ Error in server response, closing control connection.\n")); fd_close (csock); + con->csock = -1; fd_close (dtsock); fd_close (local_sock); - rbuf_uninitialize (&con->rbuf); return err; - break; case WRITEFAILED: logputs (LOG_VERBOSE, "\n"); logputs (LOG_NOTQUIET, _("Write failed, closing control connection.\n")); fd_close (csock); + con->csock = -1; fd_close (dtsock); fd_close (local_sock); - rbuf_uninitialize (&con->rbuf); return err; - break; case FTPRESTFAIL: - /* If `-c' is specified and the file already existed when - Wget was started, it would be a bad idea for us to start - downloading it from scratch, effectively truncating it. */ - if (opt.always_rest && (cmd & NO_TRUNCATE)) - { - logprintf (LOG_NOTQUIET, - _("\nREST failed; will not truncate `%s'.\n"), - con->target); - fd_close (csock); - fd_close (dtsock); - fd_close (local_sock); - rbuf_uninitialize (&con->rbuf); - return CONTNOTSUPPORTED; - } logputs (LOG_VERBOSE, _("\nREST failed, starting from scratch.\n")); - restval = 0L; + rest_failed = true; break; case FTPOK: - /* fine and dandy */ break; default: abort (); - break; } if (err != FTPRESTFAIL && !opt.server_response) logputs (LOG_VERBOSE, _("done. ")); @@ -836,9 +785,9 @@ Error in server response, closing control connection.\n")); if (opt.spider) { fd_close (csock); + con->csock = -1; fd_close (dtsock); fd_close (local_sock); - rbuf_uninitialize (&con->rbuf); return RETRFINISHED; } @@ -848,11 +797,11 @@ Error in server response, closing control connection.\n")); { if (restval) logputs (LOG_VERBOSE, "\n"); - logprintf (LOG_VERBOSE, "==> RETR %s ... ", u->file); + logprintf (LOG_VERBOSE, "==> RETR %s ... ", escnonprint (u->file)); } } - err = ftp_retr (&con->rbuf, u->file); + err = ftp_retr (csock, u->file); /* FTPRERR, WRITEFAILED, FTPNSFOD */ switch (err) { @@ -861,34 +810,30 @@ Error in server response, closing control connection.\n")); logputs (LOG_NOTQUIET, _("\ Error in server response, closing control connection.\n")); fd_close (csock); + con->csock = -1; fd_close (dtsock); fd_close (local_sock); - rbuf_uninitialize (&con->rbuf); return err; - break; case WRITEFAILED: logputs (LOG_VERBOSE, "\n"); logputs (LOG_NOTQUIET, _("Write failed, closing control connection.\n")); fd_close (csock); + con->csock = -1; fd_close (dtsock); fd_close (local_sock); - rbuf_uninitialize (&con->rbuf); return err; - break; case FTPNSFOD: logputs (LOG_VERBOSE, "\n"); - logprintf (LOG_NOTQUIET, _("No such file `%s'.\n\n"), u->file); + logprintf (LOG_NOTQUIET, _("No such file `%s'.\n\n"), + escnonprint (u->file)); fd_close (dtsock); fd_close (local_sock); return err; - break; case FTPOK: - /* fine and dandy */ break; default: abort (); - break; } if (!opt.server_response) @@ -903,7 +848,7 @@ Error in server response, closing control connection.\n")); /* As Maciej W. Rozycki (macro@ds2.pg.gda.pl) says, `LIST' without arguments is better than `LIST .'; confirmed by RFC959. */ - err = ftp_list (&con->rbuf, NULL); + err = ftp_list (csock, NULL); /* FTPRERR, WRITEFAILED */ switch (err) { @@ -912,21 +857,19 @@ Error in server response, closing control connection.\n")); logputs (LOG_NOTQUIET, _("\ Error in server response, closing control connection.\n")); fd_close (csock); + con->csock = -1; fd_close (dtsock); fd_close (local_sock); - rbuf_uninitialize (&con->rbuf); return err; - break; case WRITEFAILED: logputs (LOG_VERBOSE, "\n"); logputs (LOG_NOTQUIET, _("Write failed, closing control connection.\n")); fd_close (csock); + con->csock = -1; fd_close (dtsock); fd_close (local_sock); - rbuf_uninitialize (&con->rbuf); return err; - break; case FTPNSFOD: logputs (LOG_VERBOSE, "\n"); logprintf (LOG_NOTQUIET, _("No such file or directory `%s'.\n\n"), @@ -934,13 +877,10 @@ Error in server response, closing control connection.\n")); fd_close (dtsock); fd_close (local_sock); return err; - break; case FTPOK: - /* fine and dandy */ break; default: abort (); - break; } if (!opt.server_response) logputs (LOG_VERBOSE, _("done.\n")); @@ -973,68 +913,71 @@ Error in server response, closing control connection.\n")); } } - /* Open the file -- if opt.dfp is set, use it instead. */ - if (!opt.dfp || con->cmd & DO_LIST) + /* Open the file -- if output_stream is set, use it instead. */ + if (!output_stream || con->cmd & DO_LIST) { mkalldirs (con->target); if (opt.backups) rotate_backups (con->target); - /* #### Is this correct? */ - chmod (con->target, 0600); - fp = fopen (con->target, restval ? "ab" : "wb"); + if (restval) + fp = fopen (con->target, "ab"); + else if (opt.noclobber || opt.always_rest || opt.timestamping || opt.dirstruct + || opt.output_document) + fp = fopen (con->target, "wb"); + else + { + fp = fopen_excl (con->target, true); + if (!fp && errno == EEXIST) + { + /* We cannot just invent a new name and use it (which is + what functions like unique_create typically do) + because we told the user we'd use this name. + Instead, return and retry the download. */ + logprintf (LOG_NOTQUIET, _("%s has sprung into existence.\n"), + con->target); + fd_close (csock); + con->csock = -1; + fd_close (dtsock); + fd_close (local_sock); + return FOPEN_EXCL_ERR; + } + } if (!fp) { logprintf (LOG_NOTQUIET, "%s: %s\n", con->target, strerror (errno)); fd_close (csock); - rbuf_uninitialize (&con->rbuf); + con->csock = -1; fd_close (dtsock); fd_close (local_sock); return FOPENERR; } } else - { - extern int global_download_count; - fp = opt.dfp; - - /* Rewind the output document if the download starts over and if - this is the first download. See gethttp() for a longer - explanation. */ - if (!restval && global_download_count == 0 && opt.dfp != stdout) - { - /* This will silently fail for streams that don't correspond - to regular files, but that's OK. */ - rewind (fp); - /* ftruncate is needed because opt.dfp is opened in append - mode if opt.always_rest is set. */ - ftruncate (fileno (fp), 0); - clearerr (fp); - } - } + fp = output_stream; if (*len) { - logprintf (LOG_VERBOSE, _("Length: %s"), legible (*len)); - if (restval) - logprintf (LOG_VERBOSE, _(" [%s to go]"), legible (*len - restval)); - logputs (LOG_VERBOSE, "\n"); + print_length (*len, restval, true); expected_bytes = *len; /* for get_contents/show_progress */ } else if (expected_bytes) - { - logprintf (LOG_VERBOSE, _("Length: %s"), legible (expected_bytes)); - if (restval) - logprintf (LOG_VERBOSE, _(" [%s to go]"), - legible (expected_bytes - restval)); - logputs (LOG_VERBOSE, _(" (unauthoritative)\n")); - } + print_length (expected_bytes, restval, false); /* Get the contents of the document. */ - res = get_contents (dtsock, fp, len, restval, expected_bytes, &con->rbuf, - 0, &con->dltime); + flags = 0; + if (restval && rest_failed) + flags |= rb_skip_startpos; + *len = restval; + rd_size = 0; + res = fd_read_body (dtsock, fp, + expected_bytes ? expected_bytes - restval : 0, + restval, &rd_size, len, &con->dltime, flags); + tms = time_str (NULL); - tmrate = retr_rate (*len - restval, 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); @@ -1044,7 +987,7 @@ Error in server response, closing control connection.\n")); error here. Checking the result of fwrite() is not enough -- errors could go unnoticed! */ int flush_res; - if (!opt.dfp || con->cmd & DO_LIST) + if (!output_stream || con->cmd & DO_LIST) flush_res = fclose (fp); else flush_res = fflush (fp); @@ -1058,7 +1001,7 @@ Error in server response, closing control connection.\n")); logprintf (LOG_NOTQUIET, _("%s: %s, closing control connection.\n"), con->target, strerror (errno)); fd_close (csock); - rbuf_uninitialize (&con->rbuf); + con->csock = -1; return FWRITEERR; } else if (res == -1) @@ -1070,9 +1013,7 @@ Error in server response, closing control connection.\n")); } /* Get the server to tell us if everything is retrieved. */ - err = ftp_response (&con->rbuf, &respline); - /* ...and empty the buffer. */ - rbuf_discard (&con->rbuf); + err = ftp_response (csock, &respline); if (err != FTPOK) { xfree (respline); @@ -1086,7 +1027,7 @@ Error in server response, closing control connection.\n")); whole file was retrieved nevertheless (but that is for ftp_loop_internal to decide). */ fd_close (csock); - rbuf_uninitialize (&con->rbuf); + con->csock = -1; return FTPRETRINT; } /* err != FTPOK */ /* If retrieval failed for any reason, return FTPRETRINT, but do not @@ -1112,10 +1053,10 @@ Error in server response, closing control connection.\n")); if (!(cmd & LEAVE_PENDING)) { - /* I should probably send 'QUIT' and check for a reply, but this - is faster. #### Is it OK, though? */ + /* Closing the socket is faster than sending 'QUIT' and the + effect is the same. */ fd_close (csock); - rbuf_uninitialize (&con->rbuf); + con->csock = -1; } /* If it was a listing, and opt.server_response is true, print it out. */ @@ -1130,9 +1071,9 @@ Error in server response, closing control connection.\n")); char *line; /* The lines are being read with read_whole_line because of no-buffering on opt.lfile. */ - while ((line = read_whole_line (fp))) + while ((line = read_whole_line (fp)) != NULL) { - logprintf (LOG_ALWAYS, "%s\n", line); + logprintf (LOG_ALWAYS, "%s\n", escnonprint (line)); xfree (line); } fclose (fp); @@ -1151,11 +1092,11 @@ static uerr_t ftp_loop_internal (struct url *u, struct fileinfo *f, ccon *con) { int count, orig_lp; - long restval, len; + wgint restval, len = 0; char *tms, *locf; - char *tmrate = NULL; + const char *tmrate = NULL; uerr_t err; - struct stat st; + struct_stat st; if (!con->target) con->target = url_file_name (u); @@ -1163,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; } @@ -1192,14 +1133,14 @@ ftp_loop_internal (struct url *u, struct fileinfo *f, ccon *con) { con->cmd = 0; con->cmd |= (DO_RETR | LEAVE_PENDING); - if (rbuf_initialized_p (&con->rbuf)) + if (con->csock != -1) con->cmd &= ~ (DO_LOGIN | DO_CWD); else con->cmd |= (DO_LOGIN | DO_CWD); } else /* not on your own */ { - if (rbuf_initialized_p (&con->rbuf)) + if (con->csock != -1) con->cmd &= ~DO_LOGIN; else con->cmd |= DO_LOGIN; @@ -1209,35 +1150,33 @@ ftp_loop_internal (struct url *u, struct fileinfo *f, ccon *con) con->cmd |= DO_CWD; } - /* Assume no restarting. */ - restval = 0L; - if ((count > 1 || opt.always_rest) - && !(con->cmd & DO_LIST) - && file_exists_p (locf)) - if (stat (locf, &st) == 0 && S_ISREG (st.st_mode)) - restval = st.st_size; - - /* In `-c' is used, check whether the file we're writing to - exists and is of non-zero length. If so, we'll refuse to - truncate it if the server doesn't support continued - downloads. */ - if (opt.always_rest && restval > 0) - con->cmd |= NO_TRUNCATE; + /* Decide whether or not to restart. */ + 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 tmp[15]; + char *hurl = url_string (u, true); + char tmp[256]; strcpy (tmp, " "); if (count > 1) sprintf (tmp, _("(try:%2d)"), count); logprintf (LOG_VERBOSE, "--%s-- %s\n %s => `%s'\n", tms, hurl, tmp, locf); #ifdef WINDOWS - ws_changetitle (hurl, 1); + ws_changetitle (hurl); #endif xfree (hurl); } @@ -1248,7 +1187,7 @@ ftp_loop_internal (struct url *u, struct fileinfo *f, ccon *con) len = 0; err = getftp (u, &len, restval, con); - if (!rbuf_initialized_p (&con->rbuf)) + if (con->csock != -1) con->st &= ~DONE_CWD; else con->st |= DONE_CWD; @@ -1259,14 +1198,20 @@ ftp_loop_internal (struct url *u, struct fileinfo *f, ccon *con) case FTPNSFOD: case FTPLOGINC: case FTPNOPASV: case CONTNOTSUPPORTED: /* Fatal errors, give up. */ return err; - break; case CONSOCKERR: case CONERROR: case FTPSRVERR: case FTPRERR: case WRITEFAILED: case FTPUNKNOWNTYPE: case FTPSYSERR: case FTPPORTERR: case FTPLOGREFUSED: case FTPINVPASV: + case FOPEN_EXCL_ERR: printwhat (count, opt.ntry); /* non-fatal errors */ + if (err == FOPEN_EXCL_ERR) + { + /* Re-determine the file name. */ + xfree_null (con->target); + con->target = url_file_name (u); + locf = con->target; + } continue; - break; case FTPRETRINT: /* If the control connection was closed, the retrieval will be considered OK if f->size == len. */ @@ -1283,10 +1228,9 @@ ftp_loop_internal (struct url *u, struct fileinfo *f, ccon *con) /* Not as great. */ abort (); } - /* Time? */ 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. */ @@ -1294,20 +1238,20 @@ ftp_loop_internal (struct url *u, struct fileinfo *f, ccon *con) if (con->st & ON_YOUR_OWN) { - fd_close (RBUF_FD (&con->rbuf)); - rbuf_uninitialize (&con->rbuf); + fd_close (con->csock); + con->csock = -1; } if (!opt.spider) - logprintf (LOG_VERBOSE, _("%s (%s) - `%s' saved [%ld]\n\n"), - tms, tmrate, locf, len); + logprintf (LOG_VERBOSE, _("%s (%s) - `%s' saved [%s]\n\n"), + tms, tmrate, locf, number_to_static_string (len)); if (!opt.verbose && !opt.quiet) { /* 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); - logprintf (LOG_NONVERBOSE, "%s URL: %s [%ld] -> \"%s\" [%d]\n", - tms, hurl, len, locf, count); + 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); } @@ -1338,8 +1282,8 @@ ftp_loop_internal (struct url *u, struct fileinfo *f, ccon *con) if (opt.delete_after) { - DEBUGP (("Removing file due to --delete-after in" - " ftp_loop_internal():\n")); + DEBUGP (("\ +Removing file due to --delete-after in ftp_loop_internal():\n")); logprintf (LOG_VERBOSE, _("Removing %s.\n"), locf); if (unlink (locf)) logprintf (LOG_NOTQUIET, "unlink: %s\n", strerror (errno)); @@ -1354,10 +1298,10 @@ ftp_loop_internal (struct url *u, struct fileinfo *f, ccon *con) return RETROK; } while (!opt.ntry || (count < opt.ntry)); - if (rbuf_initialized_p (&con->rbuf) && (con->st & ON_YOUR_OWN)) + if (con->csock != -1 && (con->st & ON_YOUR_OWN)) { - fd_close (RBUF_FD (&con->rbuf)); - rbuf_uninitialize (&con->rbuf); + fd_close (con->csock); + con->csock = -1; } return TRYLIMEXC; } @@ -1404,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 @@ -1424,9 +1366,9 @@ ftp_retrieve_list (struct url *u, struct fileinfo *f, ccon *con) static int depth = 0; uerr_t err; struct fileinfo *orig; - long local_size; + wgint local_size; time_t tml; - int dlthis; + bool dlthis; /* Increase the depth. */ ++depth; @@ -1448,7 +1390,7 @@ ftp_retrieve_list (struct url *u, struct fileinfo *f, ccon *con) con->cmd &= ~DO_CWD; con->cmd |= (DO_RETR | LEAVE_PENDING); - if (!rbuf_initialized_p (&con->rbuf)) + if (con->csock < 0) con->cmd |= DO_LOGIN; else con->cmd &= ~DO_LOGIN; @@ -1472,10 +1414,10 @@ 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; + struct_stat st; /* If conversion of HTML files retrieved via FTP is ever implemented, we'll need to stat() .orig here when -K has been specified. I'm not implementing it now since files on an FTP server are much @@ -1483,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; @@ -1497,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) { @@ -1517,7 +1459,8 @@ Remote file is newer than local file `%s' -- retrieving.\n\n"), { /* Sizes do not match */ logprintf (LOG_VERBOSE, _("\ -The sizes do not match (local %ld) -- retrieving.\n\n"), local_size); +The sizes do not match (local %s) -- retrieving.\n\n"), + number_to_static_string (local_size)); } } } /* opt.timestamping && f->type == FT_PLAINFILE */ @@ -1536,7 +1479,7 @@ The sizes do not match (local %ld) -- retrieving.\n\n"), local_size); _("Invalid name of the symlink, skipping.\n")); else { - struct stat st; + struct_stat st; /* Check whether we already have the correct symbolic link. */ int rc = lstat (con->target, &st); @@ -1552,19 +1495,18 @@ The sizes do not match (local %ld) -- retrieving.\n\n"), local_size); { logprintf (LOG_VERBOSE, _("\ Already have correct symlink %s -> %s\n\n"), - con->target, f->linkto); - dlthis = 0; + con->target, escnonprint (f->linkto)); + dlthis = false; break; } } } logprintf (LOG_VERBOSE, _("Creating symlink %s -> %s\n"), - con->target, f->linkto); + con->target, escnonprint (f->linkto)); /* Unlink before creating symlink! */ unlink (con->target); if (symlink (f->linkto, con->target) == -1) - logprintf (LOG_NOTQUIET, "symlink: %s\n", - strerror (errno)); + logprintf (LOG_NOTQUIET, "symlink: %s\n", strerror (errno)); logputs (LOG_VERBOSE, "\n"); } /* have f->linkto */ #else /* not HAVE_SYMLINK */ @@ -1582,7 +1524,7 @@ Already have correct symlink %s -> %s\n\n"), case FT_DIRECTORY: if (!opt.recursive) logprintf (LOG_NOTQUIET, _("Skipping directory `%s'.\n"), - f->name); + escnonprint (f->name)); break; case FT_PLAINFILE: /* Call the retrieve loop. */ @@ -1591,7 +1533,7 @@ Already have correct symlink %s -> %s\n\n"), break; case FT_UNKNOWN: logprintf (LOG_NOTQUIET, _("%s: unknown/unsupported file type.\n"), - f->name); + escnonprint (f->name)); break; } /* switch */ @@ -1608,7 +1550,7 @@ Already have correct symlink %s -> %s\n\n"), const char *fl = NULL; if (opt.output_document) { - if (opt.od_known_regular) + if (output_stream_regular) fl = opt.output_document; } else @@ -1696,7 +1638,8 @@ ftp_retrieve_dirs (struct url *u, struct fileinfo *f, ccon *con) if (!accdir (newdir, ALLABS)) { logprintf (LOG_VERBOSE, _("\ -Not descending to `%s' as it is excluded/not-included.\n"), newdir); +Not descending to `%s' as it is excluded/not-included.\n"), + escnonprint (newdir)); continue; } @@ -1705,7 +1648,7 @@ Not descending to `%s' as it is excluded/not-included.\n"), newdir); odir = xstrdup (u->dir); /* because url_set_dir will free u->dir. */ url_set_dir (u, newdir); - ftp_retrieve_glob (u, con, GETALL); + ftp_retrieve_glob (u, con, GLOB_GETALL); url_set_dir (u, odir); xfree (odir); @@ -1718,17 +1661,17 @@ Not descending to `%s' as it is excluded/not-included.\n"), newdir); 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; + if (strstr (s, "../") != 0) + return true; - return 0; + return false; } /* A near-top-level function to retrieve the files in a directory. @@ -1736,9 +1679,10 @@ has_insecure_name_p (const char *s) Then it weeds out the file names that do not match the pattern. ftp_retrieve_list is called with this updated list as an argument. - If the argument ACTION is GETONE, just download the file (but first - get the listing, so that the time-stamp is heeded); if it's GLOBALL, - use globbing; if it's GETALL, download the whole directory. */ + If the argument ACTION is GLOB_GETONE, just download the file (but + first get the listing, so that the time-stamp is heeded); if it's + GLOB_GLOBALL, use globbing; if it's GLOB_GETALL, download the whole + directory. */ static uerr_t ftp_retrieve_glob (struct url *u, ccon *con, int action) { @@ -1759,7 +1703,8 @@ ftp_retrieve_glob (struct url *u, ccon *con, int action) { if (f->type != FT_DIRECTORY && !acceptable (f->name)) { - logprintf (LOG_VERBOSE, _("Rejecting `%s'.\n"), f->name); + logprintf (LOG_VERBOSE, _("Rejecting `%s'.\n"), + escnonprint (f->name)); f = delelement (f, &start); } else @@ -1772,7 +1717,8 @@ ftp_retrieve_glob (struct url *u, ccon *con, int action) { if (has_insecure_name_p (f->name)) { - logprintf (LOG_VERBOSE, _("Rejecting `%s'.\n"), f->name); + logprintf (LOG_VERBOSE, _("Rejecting `%s'.\n"), + escnonprint (f->name)); f = delelement (f, &start); } else @@ -1780,7 +1726,7 @@ ftp_retrieve_glob (struct url *u, ccon *con, int action) } /* Now weed out the files that do not match our globbing pattern. If we are dealing with a globbing pattern, that is. */ - if (*u->file && (action == GLOBALL || action == GETONE)) + if (*u->file && (action == GLOB_GLOBALL || action == GLOB_GETONE)) { int matchres = 0; @@ -1805,7 +1751,6 @@ ftp_retrieve_glob (struct url *u, ccon *con, int action) return RETRBADPATTERN; } } - res = RETROK; if (start) { /* Just get everything. */ @@ -1813,14 +1758,15 @@ ftp_retrieve_glob (struct url *u, ccon *con, int action) } else if (!start) { - if (action == GLOBALL) + if (action == GLOB_GLOBALL) { /* No luck. */ /* #### This message SUCKS. We should see what was the reason that nothing was retrieved. */ - logprintf (LOG_VERBOSE, _("No matches on pattern `%s'.\n"), u->file); + logprintf (LOG_VERBOSE, _("No matches on pattern `%s'.\n"), + escnonprint (u->file)); } - else /* GETONE or GETALL */ + else /* GLOB_GETONE or GLOB_GETALL */ { /* Let's try retrieving it anyway. */ con->st |= ON_YOUR_OWN; @@ -1847,14 +1793,13 @@ ftp_loop (struct url *u, int *dt, struct url *proxy) *dt = 0; - memset (&con, 0, sizeof (con)); + xzero (con); - rbuf_uninitialize (&con.rbuf); + con.csock = -1; con.st = ON_YOUR_OWN; con.rs = ST_UNIX; con.id = NULL; con.proxy = proxy; - res = RETROK; /* in case it's not used */ /* If the file name is empty, the user probably wants a directory index. We'll provide one, properly HTML-ized. Unless @@ -1877,15 +1822,15 @@ ftp_loop (struct url *u, int *dt, struct url *proxy) { if (!opt.output_document) { - struct stat st; - long sz; + struct_stat st; + wgint sz; if (stat (filename, &st) == 0) sz = st.st_size; else sz = -1; logprintf (LOG_NOTQUIET, - _("Wrote HTML-ized index to `%s' [%ld].\n"), - filename, sz); + _("Wrote HTML-ized index to `%s' [%s].\n"), + filename, number_to_static_string (sz)); } else logprintf (LOG_NOTQUIET, @@ -1899,14 +1844,25 @@ ftp_loop (struct url *u, int *dt, struct url *proxy) } else { - int wild = has_wildcards_p (u->file); - if ((opt.ftp_glob && wild) || opt.recursive || opt.timestamping) + bool ispattern = false; + if (opt.ftp_glob) + { + /* Treat the URL as a pattern if the file name part of the + URL path contains wildcards. (Don't check for u->file + because it is unescaped and therefore doesn't leave users + the option to escape literal '*' as %2A.) */ + char *file_part = strrchr (u->path, '/'); + if (!file_part) + file_part = u->path; + ispattern = has_wildcards_p (file_part); + } + if (ispattern || opt.recursive || opt.timestamping) { /* ftp_retrieve_glob is a catch-all function that gets called if we need globbing, time-stamping or recursion. Its third argument is just what we really need. */ res = ftp_retrieve_glob (u, &con, - (opt.ftp_glob && wild) ? GLOBALL : GETONE); + ispattern ? GLOB_GLOBALL : GLOB_GETONE); } else res = ftp_loop_internal (u, NULL, &con); @@ -1916,8 +1872,8 @@ ftp_loop (struct url *u, int *dt, struct url *proxy) if (res == RETROK) *dt |= RETROKF; /* If a connection was left, quench it. */ - if (rbuf_initialized_p (&con.rbuf)) - fd_close (RBUF_FD (&con.rbuf)); + if (con.csock != -1) + fd_close (con.csock); xfree_null (con.id); con.id = NULL; xfree_null (con.target);