#include "connect.h"
#include "host.h"
#include "netrc.h"
-#include "convert.h" /* for downloaded_file */
-#include "recur.h" /* for INFINITE_RECURSION */
+#include "convert.h" /* for downloaded_file */
+#include "recur.h" /* for INFINITE_RECURSION */
/* File where the "ls -al" listing will be saved. */
#define LIST_FILENAME ".listing"
typedef struct
{
- int st; /* connection status */
- int cmd; /* command code */
- 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 */
- char *target; /* target file name */
- struct url *proxy; /* FTWK-style proxy */
+ int st; /* connection status */
+ int cmd; /* command code */
+ 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 */
+ char *target; /* target file name */
+ struct url *proxy; /* FTWK-style proxy */
} ccon;
while (1)
{
while (*s && *s != '(')
- ++s;
+ ++s;
if (!*s)
- return 0;
- ++s; /* skip the '(' */
+ return 0;
+ ++s; /* skip the '(' */
res = str_to_wgint (s, (char **) &s, 10);
if (!*s)
- return 0;
+ return 0;
while (*s && ISSPACE (*s))
- ++s;
+ ++s;
if (!*s)
- return 0;
+ return 0;
if (TOLOWER (*s) != 'b')
- continue;
+ continue;
if (strncasecmp (s, "byte", 4))
- continue;
+ continue;
else
- break;
+ break;
}
return res;
}
if (start > 0)
{
if (start >= 1024)
- logprintf (LOG_VERBOSE, _(", %s (%s) remaining"),
- number_to_static_string (size - start),
- human_readable (size - start));
+ 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));
+ logprintf (LOG_VERBOSE, _(", %s remaining"),
+ number_to_static_string (size - start));
}
logputs (LOG_VERBOSE, !authoritative ? _(" (unauthoritative)\n") : "\n");
}
getftp (struct url *u, wgint *len, wgint restval, ccon *con)
{
int csock, dtsock, local_sock, res;
- uerr_t err = RETROK; /* appease the compiler */
+ uerr_t err = RETROK; /* appease the compiler */
FILE *fp;
char *user, *passwd, *respline;
char *tms;
if (!(cmd & DO_LOGIN))
csock = con->csock;
- else /* cmd & DO_LOGIN */
+ else /* cmd & DO_LOGIN */
{
char type_char;
char *host = con->proxy ? con->proxy->host : u->host;
char *logname = user;
if (con->proxy)
- {
- /* If proxy is in use, log in as username@target-site. */
- logname = concat_strings (user, "@", u->host, (char *) 0);
- }
+ {
+ /* If proxy is in use, log in as username@target-site. */
+ logname = concat_strings (user, "@", u->host, (char *) 0);
+ }
/* Login to the server: */
csock = connect_to_host (host, port);
if (csock == E_HOST)
- return HOSTERR;
+ return HOSTERR;
else if (csock < 0)
- return (retryable_socket_connect_error (errno)
- ? CONERROR : CONIMPOSSIBLE);
+ return (retryable_socket_connect_error (errno)
+ ? CONERROR : CONIMPOSSIBLE);
if (cmd & LEAVE_PENDING)
- con->csock = csock;
+ con->csock = csock;
else
- con->csock = -1;
+ con->csock = -1;
/* Second: Login with proper USER/PASS sequence. */
logprintf (LOG_VERBOSE, _("Logging in as %s ... "), escnonprint (user));
if (opt.server_response)
- logputs (LOG_ALWAYS, "\n");
+ logputs (LOG_ALWAYS, "\n");
err = ftp_login (csock, logname, passwd);
if (con->proxy)
- xfree (logname);
+ xfree (logname);
/* FTPRERR, FTPSRVERR, WRITEFAILED, FTPLOGREFUSED, FTPLOGINC */
switch (err)
- {
- case FTPRERR:
- logputs (LOG_VERBOSE, "\n");
- logputs (LOG_NOTQUIET, _("\
+ {
+ case FTPRERR:
+ logputs (LOG_VERBOSE, "\n");
+ logputs (LOG_NOTQUIET, _("\
Error in server response, closing control connection.\n"));
- fd_close (csock);
- con->csock = -1;
- return err;
- case FTPSRVERR:
- logputs (LOG_VERBOSE, "\n");
- logputs (LOG_NOTQUIET, _("Error in server greeting.\n"));
- fd_close (csock);
- con->csock = -1;
- return err;
- case WRITEFAILED:
- logputs (LOG_VERBOSE, "\n");
- logputs (LOG_NOTQUIET,
- _("Write failed, closing control connection.\n"));
- fd_close (csock);
- con->csock = -1;
- return err;
- case FTPLOGREFUSED:
- logputs (LOG_VERBOSE, "\n");
- logputs (LOG_NOTQUIET, _("The server refuses login.\n"));
- fd_close (csock);
- con->csock = -1;
- return FTPLOGREFUSED;
- case FTPLOGINC:
- logputs (LOG_VERBOSE, "\n");
- logputs (LOG_NOTQUIET, _("Login incorrect.\n"));
- fd_close (csock);
- con->csock = -1;
- return FTPLOGINC;
- case FTPOK:
- if (!opt.server_response)
- logputs (LOG_VERBOSE, _("Logged in!\n"));
- break;
- default:
- abort ();
- }
+ fd_close (csock);
+ con->csock = -1;
+ return err;
+ case FTPSRVERR:
+ logputs (LOG_VERBOSE, "\n");
+ logputs (LOG_NOTQUIET, _("Error in server greeting.\n"));
+ fd_close (csock);
+ con->csock = -1;
+ return err;
+ case WRITEFAILED:
+ logputs (LOG_VERBOSE, "\n");
+ logputs (LOG_NOTQUIET,
+ _("Write failed, closing control connection.\n"));
+ fd_close (csock);
+ con->csock = -1;
+ return err;
+ case FTPLOGREFUSED:
+ logputs (LOG_VERBOSE, "\n");
+ logputs (LOG_NOTQUIET, _("The server refuses login.\n"));
+ fd_close (csock);
+ con->csock = -1;
+ return FTPLOGREFUSED;
+ case FTPLOGINC:
+ logputs (LOG_VERBOSE, "\n");
+ logputs (LOG_NOTQUIET, _("Login incorrect.\n"));
+ fd_close (csock);
+ con->csock = -1;
+ return FTPLOGINC;
+ case FTPOK:
+ if (!opt.server_response)
+ logputs (LOG_VERBOSE, _("Logged in!\n"));
+ break;
+ default:
+ abort ();
+ }
/* Third: Get the system type */
if (!opt.server_response)
- logprintf (LOG_VERBOSE, "==> SYST ... ");
+ logprintf (LOG_VERBOSE, "==> SYST ... ");
err = ftp_syst (csock, &con->rs);
/* FTPRERR */
switch (err)
- {
- case FTPRERR:
- logputs (LOG_VERBOSE, "\n");
- logputs (LOG_NOTQUIET, _("\
+ {
+ case FTPRERR:
+ logputs (LOG_VERBOSE, "\n");
+ logputs (LOG_NOTQUIET, _("\
Error in server response, closing control connection.\n"));
- fd_close (csock);
- con->csock = -1;
- return err;
- case FTPSRVERR:
- logputs (LOG_VERBOSE, "\n");
- logputs (LOG_NOTQUIET,
- _("Server error, can't determine system type.\n"));
- break;
- case FTPOK:
- /* Everything is OK. */
- break;
- default:
- abort ();
- }
+ fd_close (csock);
+ con->csock = -1;
+ return err;
+ case FTPSRVERR:
+ logputs (LOG_VERBOSE, "\n");
+ logputs (LOG_NOTQUIET,
+ _("Server error, can't determine system type.\n"));
+ break;
+ case FTPOK:
+ /* Everything is OK. */
+ break;
+ default:
+ abort ();
+ }
if (!opt.server_response && err != FTPSRVERR)
- logputs (LOG_VERBOSE, _("done. "));
+ logputs (LOG_VERBOSE, _("done. "));
/* Fourth: Find the initial ftp directory */
if (!opt.server_response)
- logprintf (LOG_VERBOSE, "==> PWD ... ");
+ logprintf (LOG_VERBOSE, "==> PWD ... ");
err = ftp_pwd (csock, &con->id);
/* FTPRERR */
switch (err)
- {
- case FTPRERR:
- logputs (LOG_VERBOSE, "\n");
- logputs (LOG_NOTQUIET, _("\
+ {
+ case FTPRERR:
+ logputs (LOG_VERBOSE, "\n");
+ logputs (LOG_NOTQUIET, _("\
Error in server response, closing control connection.\n"));
- fd_close (csock);
- con->csock = -1;
- return err;
- case FTPSRVERR :
- /* PWD unsupported -- assume "/". */
- xfree_null (con->id);
- con->id = xstrdup ("/");
- break;
- case FTPOK:
- /* Everything is OK. */
- break;
- default:
- abort ();
- }
+ fd_close (csock);
+ con->csock = -1;
+ return err;
+ case FTPSRVERR :
+ /* PWD unsupported -- assume "/". */
+ xfree_null (con->id);
+ con->id = xstrdup ("/");
+ break;
+ case FTPOK:
+ /* Everything is OK. */
+ break;
+ default:
+ abort ();
+ }
/* VMS will report something like "PUB$DEVICE:[INITIAL.FOLDER]".
Convert it to "/INITIAL/FOLDER" */
if (con->rs == ST_VMS)
{
char *path = strchr (con->id, '[');
- char *pathend = path ? strchr (path + 1, ']') : NULL;
- if (!path || !pathend)
- DEBUGP (("Initial VMS directory not in the form [...]!\n"));
- else
- {
- char *idir = con->id;
- DEBUGP (("Preprocessing the initial VMS directory\n"));
- DEBUGP ((" old = '%s'\n", con->id));
- /* We do the conversion in-place by copying the stuff
- between [ and ] to the beginning, and changing dots
- to slashes at the same time. */
- *idir++ = '/';
- for (++path; path < pathend; path++, idir++)
- *idir = *path == '.' ? '/' : *path;
- *idir = '\0';
- DEBUGP ((" new = '%s'\n\n", con->id));
- }
- }
+ char *pathend = path ? strchr (path + 1, ']') : NULL;
+ if (!path || !pathend)
+ DEBUGP (("Initial VMS directory not in the form [...]!\n"));
+ else
+ {
+ char *idir = con->id;
+ DEBUGP (("Preprocessing the initial VMS directory\n"));
+ DEBUGP ((" old = '%s'\n", con->id));
+ /* We do the conversion in-place by copying the stuff
+ between [ and ] to the beginning, and changing dots
+ to slashes at the same time. */
+ *idir++ = '/';
+ for (++path; path < pathend; path++, idir++)
+ *idir = *path == '.' ? '/' : *path;
+ *idir = '\0';
+ DEBUGP ((" new = '%s'\n\n", con->id));
+ }
+ }
if (!opt.server_response)
- logputs (LOG_VERBOSE, _("done.\n"));
+ logputs (LOG_VERBOSE, _("done.\n"));
/* Fifth: Set the FTP type. */
type_char = ftp_process_type (u->params);
if (!opt.server_response)
- logprintf (LOG_VERBOSE, "==> TYPE %c ... ", type_char);
+ logprintf (LOG_VERBOSE, "==> TYPE %c ... ", type_char);
err = ftp_type (csock, type_char);
/* FTPRERR, WRITEFAILED, FTPUNKNOWNTYPE */
switch (err)
- {
- case FTPRERR:
- logputs (LOG_VERBOSE, "\n");
- logputs (LOG_NOTQUIET, _("\
+ {
+ case FTPRERR:
+ logputs (LOG_VERBOSE, "\n");
+ logputs (LOG_NOTQUIET, _("\
Error in server response, closing control connection.\n"));
- fd_close (csock);
- con->csock = -1;
- return err;
- case WRITEFAILED:
- logputs (LOG_VERBOSE, "\n");
- logputs (LOG_NOTQUIET,
- _("Write failed, closing control connection.\n"));
- fd_close (csock);
- con->csock = -1;
- return err;
- case FTPUNKNOWNTYPE:
- logputs (LOG_VERBOSE, "\n");
- logprintf (LOG_NOTQUIET,
- _("Unknown type `%c', closing control connection.\n"),
- type_char);
- fd_close (csock);
- con->csock = -1;
- return err;
- case FTPOK:
- /* Everything is OK. */
- break;
- default:
- abort ();
- }
+ fd_close (csock);
+ con->csock = -1;
+ return err;
+ case WRITEFAILED:
+ logputs (LOG_VERBOSE, "\n");
+ logputs (LOG_NOTQUIET,
+ _("Write failed, closing control connection.\n"));
+ fd_close (csock);
+ con->csock = -1;
+ return err;
+ case FTPUNKNOWNTYPE:
+ logputs (LOG_VERBOSE, "\n");
+ logprintf (LOG_NOTQUIET,
+ _("Unknown type `%c', closing control connection.\n"),
+ type_char);
+ fd_close (csock);
+ con->csock = -1;
+ return err;
+ case FTPOK:
+ /* Everything is OK. */
+ break;
+ default:
+ abort ();
+ }
if (!opt.server_response)
- logputs (LOG_VERBOSE, _("done. "));
+ logputs (LOG_VERBOSE, _("done. "));
} /* do login */
if (cmd & DO_CWD)
{
if (!*u->dir)
- logputs (LOG_VERBOSE, _("==> CWD not needed.\n"));
+ logputs (LOG_VERBOSE, _("==> CWD not needed.\n"));
else
- {
- char *target = u->dir;
-
- DEBUGP (("changing working directory\n"));
-
- /* Change working directory. To change to a non-absolute
- Unix directory, we need to prepend initial directory
- (con->id) to it. Absolute directories "just work".
-
- A relative directory is one that does not begin with '/'
- and, on non-Unix OS'es, one that doesn't begin with
- "[a-z]:".
-
- This is not done for OS400, which doesn't use
- "/"-delimited directories, nor does it support directory
- hierarchies. "CWD foo" followed by "CWD bar" leaves us
- in "bar", not in "foo/bar", as would be customary
- elsewhere. */
-
- if (target[0] != '/'
- && !(con->rs != ST_UNIX
- && ISALPHA (target[0])
- && target[1] == ':')
- && con->rs != ST_OS400)
- {
- int idlen = strlen (con->id);
- char *ntarget, *p;
-
- /* Strip trailing slash(es) from con->id. */
- while (idlen > 0 && con->id[idlen - 1] == '/')
- --idlen;
- p = ntarget = (char *)alloca (idlen + 1 + strlen (u->dir) + 1);
- memcpy (p, con->id, idlen);
- p += idlen;
- *p++ = '/';
- strcpy (p, target);
+ {
+ char *target = u->dir;
+
+ DEBUGP (("changing working directory\n"));
+
+ /* Change working directory. To change to a non-absolute
+ Unix directory, we need to prepend initial directory
+ (con->id) to it. Absolute directories "just work".
+
+ A relative directory is one that does not begin with '/'
+ and, on non-Unix OS'es, one that doesn't begin with
+ "[a-z]:".
+
+ This is not done for OS400, which doesn't use
+ "/"-delimited directories, nor does it support directory
+ hierarchies. "CWD foo" followed by "CWD bar" leaves us
+ in "bar", not in "foo/bar", as would be customary
+ elsewhere. */
+
+ if (target[0] != '/'
+ && !(con->rs != ST_UNIX
+ && ISALPHA (target[0])
+ && target[1] == ':')
+ && con->rs != ST_OS400)
+ {
+ int idlen = strlen (con->id);
+ char *ntarget, *p;
+
+ /* Strip trailing slash(es) from con->id. */
+ while (idlen > 0 && con->id[idlen - 1] == '/')
+ --idlen;
+ p = ntarget = (char *)alloca (idlen + 1 + strlen (u->dir) + 1);
+ memcpy (p, con->id, idlen);
+ p += idlen;
+ *p++ = '/';
+ strcpy (p, target);
DEBUGP (("Prepended initial PWD to relative path:\n"));
DEBUGP ((" pwd: '%s'\n old: '%s'\n new: '%s'\n",
- con->id, target, ntarget));
- target = ntarget;
- }
+ con->id, target, ntarget));
+ target = ntarget;
+ }
- /* If the FTP host runs VMS, we will have to convert the absolute
+ /* If the FTP host runs VMS, we will have to convert the absolute
directory path in UNIX notation to absolute directory path in
VMS notation as VMS FTP servers do not like UNIX notation of
absolute paths. "VMS notation" is [dir.subdir.subsubdir]. */
- if (con->rs == ST_VMS)
- {
- char *tmpp;
- char *ntarget = (char *)alloca (strlen (target) + 2);
- /* We use a converted initial dir, so directories in
+ if (con->rs == ST_VMS)
+ {
+ char *tmpp;
+ char *ntarget = (char *)alloca (strlen (target) + 2);
+ /* We use a converted initial dir, so directories in
TARGET will be separated with slashes, something like
"/INITIAL/FOLDER/DIR/SUBDIR". Convert that to
"[INITIAL.FOLDER.DIR.SUBDIR]". */
- strcpy (ntarget, target);
- assert (*ntarget == '/');
- *ntarget = '[';
- for (tmpp = ntarget + 1; *tmpp; tmpp++)
- if (*tmpp == '/')
- *tmpp = '.';
- *tmpp++ = ']';
- *tmpp = '\0';
+ strcpy (ntarget, target);
+ assert (*ntarget == '/');
+ *ntarget = '[';
+ for (tmpp = ntarget + 1; *tmpp; tmpp++)
+ if (*tmpp == '/')
+ *tmpp = '.';
+ *tmpp++ = ']';
+ *tmpp = '\0';
DEBUGP (("Changed file name to VMS syntax:\n"));
DEBUGP ((" Unix: '%s'\n VMS: '%s'\n", target, ntarget));
- target = ntarget;
- }
-
- if (!opt.server_response)
- logprintf (LOG_VERBOSE, "==> CWD %s ... ", escnonprint (target));
- err = ftp_cwd (csock, target);
- /* FTPRERR, WRITEFAILED, FTPNSFOD */
- switch (err)
- {
- case FTPRERR:
- logputs (LOG_VERBOSE, "\n");
- logputs (LOG_NOTQUIET, _("\
+ target = ntarget;
+ }
+
+ if (!opt.server_response)
+ logprintf (LOG_VERBOSE, "==> CWD %s ... ", escnonprint (target));
+ err = ftp_cwd (csock, target);
+ /* FTPRERR, WRITEFAILED, FTPNSFOD */
+ switch (err)
+ {
+ case FTPRERR:
+ logputs (LOG_VERBOSE, "\n");
+ logputs (LOG_NOTQUIET, _("\
Error in server response, closing control connection.\n"));
- fd_close (csock);
- con->csock = -1;
- return err;
- case WRITEFAILED:
- logputs (LOG_VERBOSE, "\n");
- logputs (LOG_NOTQUIET,
- _("Write failed, closing control connection.\n"));
- fd_close (csock);
- con->csock = -1;
- return err;
- case FTPNSFOD:
- logputs (LOG_VERBOSE, "\n");
- logprintf (LOG_NOTQUIET, _("No such directory `%s'.\n\n"),
- escnonprint (u->dir));
- fd_close (csock);
- con->csock = -1;
- return err;
- case FTPOK:
- break;
- default:
- abort ();
- }
- if (!opt.server_response)
- logputs (LOG_VERBOSE, _("done.\n"));
- }
+ fd_close (csock);
+ con->csock = -1;
+ return err;
+ case WRITEFAILED:
+ logputs (LOG_VERBOSE, "\n");
+ logputs (LOG_NOTQUIET,
+ _("Write failed, closing control connection.\n"));
+ fd_close (csock);
+ con->csock = -1;
+ return err;
+ case FTPNSFOD:
+ logputs (LOG_VERBOSE, "\n");
+ logprintf (LOG_NOTQUIET, _("No such directory `%s'.\n\n"),
+ escnonprint (u->dir));
+ fd_close (csock);
+ con->csock = -1;
+ return err;
+ case FTPOK:
+ break;
+ default:
+ abort ();
+ }
+ if (!opt.server_response)
+ logputs (LOG_VERBOSE, _("done.\n"));
+ }
}
else /* do not CWD */
logputs (LOG_VERBOSE, _("==> CWD not required.\n"));
if ((cmd & DO_RETR) && *len == 0)
{
if (opt.verbose)
- {
+ {
if (!opt.server_response)
- logprintf (LOG_VERBOSE, "==> SIZE %s ... ", escnonprint (u->file));
- }
+ logprintf (LOG_VERBOSE, "==> SIZE %s ... ", escnonprint (u->file));
+ }
err = ftp_size (csock, u->file, len);
/* FTPRERR */
switch (err)
- {
- case FTPRERR:
- case FTPSRVERR:
- logputs (LOG_VERBOSE, "\n");
- logputs (LOG_NOTQUIET, _("\
+ {
+ case FTPRERR:
+ case FTPSRVERR:
+ logputs (LOG_VERBOSE, "\n");
+ logputs (LOG_NOTQUIET, _("\
Error in server response, closing control connection.\n"));
- fd_close (csock);
- con->csock = -1;
- return err;
- case FTPOK:
- /* Everything is OK. */
- break;
- default:
- abort ();
- }
- if (!opt.server_response)
- logprintf (LOG_VERBOSE, *len ? "%s\n" : _("done.\n"),
- number_to_static_string (*len));
+ fd_close (csock);
+ con->csock = -1;
+ return err;
+ case FTPOK:
+ /* Everything is OK. */
+ break;
+ default:
+ abort ();
+ }
+ if (!opt.server_response)
+ 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)
- {
- ip_address passive_addr;
- int passive_port;
- err = ftp_do_pasv (csock, &passive_addr, &passive_port);
- /* FTPRERR, WRITEFAILED, FTPNOPASV, FTPINVPASV */
- switch (err)
- {
- case FTPRERR:
- logputs (LOG_VERBOSE, "\n");
- logputs (LOG_NOTQUIET, _("\
+ {
+ ip_address passive_addr;
+ int passive_port;
+ err = ftp_do_pasv (csock, &passive_addr, &passive_port);
+ /* FTPRERR, WRITEFAILED, FTPNOPASV, FTPINVPASV */
+ switch (err)
+ {
+ case FTPRERR:
+ logputs (LOG_VERBOSE, "\n");
+ logputs (LOG_NOTQUIET, _("\
Error in server response, closing control connection.\n"));
- fd_close (csock);
- con->csock = -1;
- return err;
- case WRITEFAILED:
- logputs (LOG_VERBOSE, "\n");
- logputs (LOG_NOTQUIET,
- _("Write failed, closing control connection.\n"));
- fd_close (csock);
- con->csock = -1;
- return err;
- case FTPNOPASV:
- logputs (LOG_VERBOSE, "\n");
- logputs (LOG_NOTQUIET, _("Cannot initiate PASV transfer.\n"));
- break;
- case FTPINVPASV:
- logputs (LOG_VERBOSE, "\n");
- logputs (LOG_NOTQUIET, _("Cannot parse PASV response.\n"));
- break;
- case FTPOK:
- break;
- default:
- abort ();
- } /* switch (err) */
- if (err==FTPOK)
- {
- DEBUGP (("trying to connect to %s port %d\n",
- print_address (&passive_addr), passive_port));
- dtsock = connect_to_ip (&passive_addr, passive_port, NULL);
- if (dtsock < 0)
- {
- int save_errno = errno;
- fd_close (csock);
- con->csock = -1;
- logprintf (LOG_VERBOSE, _("couldn't connect to %s port %d: %s\n"),
- print_address (&passive_addr), passive_port,
- strerror (save_errno));
- return (retryable_socket_connect_error (save_errno)
- ? CONERROR : CONIMPOSSIBLE);
- }
-
- pasv_mode_open = true; /* Flag to avoid accept port */
- if (!opt.server_response)
- logputs (LOG_VERBOSE, _("done. "));
- } /* err==FTP_OK */
- }
+ fd_close (csock);
+ con->csock = -1;
+ return err;
+ case WRITEFAILED:
+ logputs (LOG_VERBOSE, "\n");
+ logputs (LOG_NOTQUIET,
+ _("Write failed, closing control connection.\n"));
+ fd_close (csock);
+ con->csock = -1;
+ return err;
+ case FTPNOPASV:
+ logputs (LOG_VERBOSE, "\n");
+ logputs (LOG_NOTQUIET, _("Cannot initiate PASV transfer.\n"));
+ break;
+ case FTPINVPASV:
+ logputs (LOG_VERBOSE, "\n");
+ logputs (LOG_NOTQUIET, _("Cannot parse PASV response.\n"));
+ break;
+ case FTPOK:
+ break;
+ default:
+ abort ();
+ } /* switch (err) */
+ if (err==FTPOK)
+ {
+ DEBUGP (("trying to connect to %s port %d\n",
+ print_address (&passive_addr), passive_port));
+ dtsock = connect_to_ip (&passive_addr, passive_port, NULL);
+ if (dtsock < 0)
+ {
+ int save_errno = errno;
+ fd_close (csock);
+ con->csock = -1;
+ logprintf (LOG_VERBOSE, _("couldn't connect to %s port %d: %s\n"),
+ print_address (&passive_addr), passive_port,
+ strerror (save_errno));
+ return (retryable_socket_connect_error (save_errno)
+ ? CONERROR : CONIMPOSSIBLE);
+ }
+
+ pasv_mode_open = true; /* Flag to avoid accept port */
+ if (!opt.server_response)
+ logputs (LOG_VERBOSE, _("done. "));
+ } /* err==FTP_OK */
+ }
if (!pasv_mode_open) /* Try to use a port command if PASV failed */
- {
- err = ftp_do_port (csock, &local_sock);
- /* FTPRERR, WRITEFAILED, bindport (FTPSYSERR), HOSTERR,
- FTPPORTERR */
- switch (err)
- {
- case FTPRERR:
- logputs (LOG_VERBOSE, "\n");
- logputs (LOG_NOTQUIET, _("\
+ {
+ err = ftp_do_port (csock, &local_sock);
+ /* FTPRERR, WRITEFAILED, bindport (FTPSYSERR), HOSTERR,
+ FTPPORTERR */
+ switch (err)
+ {
+ case FTPRERR:
+ logputs (LOG_VERBOSE, "\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);
- return err;
- 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);
- return err;
- 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);
- return err;
- case FTPSYSERR:
- logputs (LOG_VERBOSE, "\n");
- logprintf (LOG_NOTQUIET, _("Bind error (%s).\n"),
- strerror (errno));
- fd_close (dtsock);
- return err;
- 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);
- return err;
- case FTPOK:
- break;
- default:
- abort ();
- } /* port switch */
- if (!opt.server_response)
- logputs (LOG_VERBOSE, _("done. "));
- } /* dtsock == -1 */
+ fd_close (csock);
+ con->csock = -1;
+ fd_close (dtsock);
+ fd_close (local_sock);
+ return err;
+ 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);
+ return err;
+ 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);
+ return err;
+ case FTPSYSERR:
+ logputs (LOG_VERBOSE, "\n");
+ logprintf (LOG_NOTQUIET, _("Bind error (%s).\n"),
+ strerror (errno));
+ fd_close (dtsock);
+ return err;
+ 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);
+ return err;
+ case FTPOK:
+ break;
+ default:
+ abort ();
+ } /* port switch */
+ if (!opt.server_response)
+ logputs (LOG_VERBOSE, _("done. "));
+ } /* dtsock == -1 */
} /* cmd & (DO_LIST | DO_RETR) */
/* Restart if needed. */
if (restval && (cmd & DO_RETR))
{
if (!opt.server_response)
- logprintf (LOG_VERBOSE, "==> REST %s ... ",
- number_to_static_string (restval));
+ logprintf (LOG_VERBOSE, "==> REST %s ... ",
+ number_to_static_string (restval));
err = ftp_rest (csock, restval);
/* FTPRERR, WRITEFAILED, FTPRESTFAIL */
switch (err)
- {
- case FTPRERR:
- logputs (LOG_VERBOSE, "\n");
- logputs (LOG_NOTQUIET, _("\
+ {
+ case FTPRERR:
+ logputs (LOG_VERBOSE, "\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);
- return err;
- 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);
- return err;
- case FTPRESTFAIL:
- logputs (LOG_VERBOSE, _("\nREST failed, starting from scratch.\n"));
- rest_failed = true;
- break;
- case FTPOK:
- break;
- default:
- abort ();
- }
+ fd_close (csock);
+ con->csock = -1;
+ fd_close (dtsock);
+ fd_close (local_sock);
+ return err;
+ 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);
+ return err;
+ case FTPRESTFAIL:
+ logputs (LOG_VERBOSE, _("\nREST failed, starting from scratch.\n"));
+ rest_failed = true;
+ break;
+ case FTPOK:
+ break;
+ default:
+ abort ();
+ }
if (err != FTPRESTFAIL && !opt.server_response)
- logputs (LOG_VERBOSE, _("done. "));
+ logputs (LOG_VERBOSE, _("done. "));
} /* restval && cmd & DO_RETR */
if (cmd & DO_RETR)
{
/* If we're in spider mode, don't really retrieve anything. The
- fact that we got to this point should be proof enough that
- the file exists, vaguely akin to HTTP's concept of a "HEAD"
- request. */
+ fact that we got to this point should be proof enough that
+ the file exists, vaguely akin to HTTP's concept of a "HEAD"
+ request. */
if (opt.spider)
- {
- fd_close (csock);
- con->csock = -1;
- fd_close (dtsock);
- fd_close (local_sock);
- return RETRFINISHED;
- }
+ {
+ fd_close (csock);
+ con->csock = -1;
+ fd_close (dtsock);
+ fd_close (local_sock);
+ return RETRFINISHED;
+ }
if (opt.verbose)
- {
- if (!opt.server_response)
- {
- if (restval)
- logputs (LOG_VERBOSE, "\n");
- logprintf (LOG_VERBOSE, "==> RETR %s ... ", escnonprint (u->file));
- }
- }
+ {
+ if (!opt.server_response)
+ {
+ if (restval)
+ logputs (LOG_VERBOSE, "\n");
+ logprintf (LOG_VERBOSE, "==> RETR %s ... ", escnonprint (u->file));
+ }
+ }
err = ftp_retr (csock, u->file);
/* FTPRERR, WRITEFAILED, FTPNSFOD */
switch (err)
- {
- case FTPRERR:
- logputs (LOG_VERBOSE, "\n");
- logputs (LOG_NOTQUIET, _("\
+ {
+ case FTPRERR:
+ logputs (LOG_VERBOSE, "\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);
- return err;
- 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);
- return err;
- case FTPNSFOD:
- logputs (LOG_VERBOSE, "\n");
- logprintf (LOG_NOTQUIET, _("No such file `%s'.\n\n"),
- escnonprint (u->file));
- fd_close (dtsock);
- fd_close (local_sock);
- return err;
- case FTPOK:
- break;
- default:
- abort ();
- }
+ fd_close (csock);
+ con->csock = -1;
+ fd_close (dtsock);
+ fd_close (local_sock);
+ return err;
+ 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);
+ return err;
+ case FTPNSFOD:
+ logputs (LOG_VERBOSE, "\n");
+ logprintf (LOG_NOTQUIET, _("No such file `%s'.\n\n"),
+ escnonprint (u->file));
+ fd_close (dtsock);
+ fd_close (local_sock);
+ return err;
+ case FTPOK:
+ break;
+ default:
+ abort ();
+ }
if (!opt.server_response)
- logputs (LOG_VERBOSE, _("done.\n"));
+ logputs (LOG_VERBOSE, _("done.\n"));
expected_bytes = ftp_expected_bytes (ftp_last_respline);
} /* do retrieve */
if (cmd & DO_LIST)
{
if (!opt.server_response)
- logputs (LOG_VERBOSE, "==> LIST ... ");
+ logputs (LOG_VERBOSE, "==> LIST ... ");
/* As Maciej W. Rozycki (macro@ds2.pg.gda.pl) says, `LIST'
- without arguments is better than `LIST .'; confirmed by
- RFC959. */
+ without arguments is better than `LIST .'; confirmed by
+ RFC959. */
err = ftp_list (csock, NULL);
/* FTPRERR, WRITEFAILED */
switch (err)
- {
- case FTPRERR:
- logputs (LOG_VERBOSE, "\n");
- logputs (LOG_NOTQUIET, _("\
+ {
+ case FTPRERR:
+ logputs (LOG_VERBOSE, "\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);
- return err;
- 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);
- return err;
- case FTPNSFOD:
- logputs (LOG_VERBOSE, "\n");
- logprintf (LOG_NOTQUIET, _("No such file or directory `%s'.\n\n"),
- ".");
- fd_close (dtsock);
- fd_close (local_sock);
- return err;
- case FTPOK:
- break;
- default:
- abort ();
- }
+ fd_close (csock);
+ con->csock = -1;
+ fd_close (dtsock);
+ fd_close (local_sock);
+ return err;
+ 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);
+ return err;
+ case FTPNSFOD:
+ logputs (LOG_VERBOSE, "\n");
+ logprintf (LOG_NOTQUIET, _("No such file or directory `%s'.\n\n"),
+ ".");
+ fd_close (dtsock);
+ fd_close (local_sock);
+ return err;
+ case FTPOK:
+ break;
+ default:
+ abort ();
+ }
if (!opt.server_response)
- logputs (LOG_VERBOSE, _("done.\n"));
+ logputs (LOG_VERBOSE, _("done.\n"));
expected_bytes = ftp_expected_bytes (ftp_last_respline);
} /* cmd & DO_LIST */
/* If no transmission was required, then everything is OK. */
if (!pasv_mode_open) /* we are not using pasive mode so we need
- to accept */
+ to accept */
{
/* Wait for the server to connect to the address we're waiting
- at. */
+ at. */
dtsock = accept_connection (local_sock);
if (dtsock < 0)
- {
- logprintf (LOG_NOTQUIET, "accept: %s\n", strerror (errno));
- return err;
- }
+ {
+ logprintf (LOG_NOTQUIET, "accept: %s\n", strerror (errno));
+ return err;
+ }
}
/* Open the file -- if output_stream is set, use it instead. */
{
mkalldirs (con->target);
if (opt.backups)
- rotate_backups (con->target);
+ rotate_backups (con->target);
if (restval)
- fp = fopen (con->target, "ab");
+ fp = fopen (con->target, "ab");
else if (opt.noclobber || opt.always_rest || opt.timestamping || opt.dirstruct
- || opt.output_document)
- fp = fopen (con->target, "wb");
+ || 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;
- }
- }
+ {
+ 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);
- con->csock = -1;
- fd_close (dtsock);
- fd_close (local_sock);
- return FOPENERR;
- }
+ {
+ logprintf (LOG_NOTQUIET, "%s: %s\n", con->target, strerror (errno));
+ fd_close (csock);
+ con->csock = -1;
+ fd_close (dtsock);
+ fd_close (local_sock);
+ return FOPENERR;
+ }
}
else
fp = output_stream;
if (*len)
{
print_length (*len, restval, true);
- expected_bytes = *len; /* for fd_read_body's progress bar */
+ expected_bytes = *len; /* for fd_read_body's progress bar */
}
else if (expected_bytes)
print_length (expected_bytes, restval, false);
*len = restval;
rd_size = 0;
res = fd_read_body (dtsock, fp,
- expected_bytes ? expected_bytes - restval : 0,
- restval, &rd_size, len, &con->dltime, flags);
+ expected_bytes ? expected_bytes - restval : 0,
+ restval, &rd_size, len, &con->dltime, flags);
tms = time_str (time (NULL));
tmrate = retr_rate (rd_size, con->dltime);
if (res == -2)
{
logprintf (LOG_NOTQUIET, _("%s: %s, closing control connection.\n"),
- con->target, strerror (errno));
+ con->target, strerror (errno));
fd_close (csock);
con->csock = -1;
fd_close (dtsock);
else if (res == -1)
{
logprintf (LOG_NOTQUIET, _("%s (%s) - Data connection: %s; "),
- tms, tmrate, fd_errstr (dtsock));
+ tms, tmrate, fd_errstr (dtsock));
if (opt.server_response)
- logputs (LOG_ALWAYS, "\n");
+ logputs (LOG_ALWAYS, "\n");
}
fd_close (dtsock);
if (err != FTPOK)
{
/* The control connection is decidedly closed. Print the time
- only if it hasn't already been printed. */
+ only if it hasn't already been printed. */
if (res != -1)
- logprintf (LOG_NOTQUIET, "%s (%s) - ", tms, tmrate);
+ logprintf (LOG_NOTQUIET, "%s (%s) - ", tms, tmrate);
logputs (LOG_NOTQUIET, _("Control connection closed.\n"));
/* If there is an error on the control connection, close it, but
- return FTPRETRINT, since there is a possibility that the
- whole file was retrieved nevertheless (but that is for
- ftp_loop_internal to decide). */
+ return FTPRETRINT, since there is a possibility that the
+ whole file was retrieved nevertheless (but that is for
+ ftp_loop_internal to decide). */
fd_close (csock);
con->csock = -1;
return FTPRETRINT;
{
xfree (respline);
if (res != -1)
- logprintf (LOG_NOTQUIET, "%s (%s) - ", tms, tmrate);
+ logprintf (LOG_NOTQUIET, "%s (%s) - ", tms, tmrate);
logputs (LOG_NOTQUIET, _("Data transfer aborted.\n"));
return FTPRETRINT;
}
if (res == -1)
{
/* What now? The data connection was erroneous, whereas the
- response says everything is OK. We shall play it safe. */
+ response says everything is OK. We shall play it safe. */
return FTPRETRINT;
}
if (!(cmd & LEAVE_PENDING))
{
/* Closing the socket is faster than sending 'QUIT' and the
- effect is the same. */
+ effect is the same. */
fd_close (csock);
con->csock = -1;
}
mkalldirs (con->target);
fp = fopen (con->target, "r");
if (!fp)
- logprintf (LOG_ALWAYS, "%s: %s\n", con->target, strerror (errno));
+ logprintf (LOG_ALWAYS, "%s: %s\n", con->target, strerror (errno));
else
- {
- char *line;
- /* The lines are being read with read_whole_line because of
- no-buffering on opt.lfile. */
- while ((line = read_whole_line (fp)) != NULL)
- {
- char *p = strchr (line, '\0');
- while (p > line && (p[-1] == '\n' || p[-1] == '\r'))
- *--p = '\0';
- logprintf (LOG_ALWAYS, "%s\n", escnonprint (line));
- xfree (line);
- }
- fclose (fp);
- }
+ {
+ char *line;
+ /* The lines are being read with read_whole_line because of
+ no-buffering on opt.lfile. */
+ while ((line = read_whole_line (fp)) != NULL)
+ {
+ char *p = strchr (line, '\0');
+ while (p > line && (p[-1] == '\n' || p[-1] == '\r'))
+ *--p = '\0';
+ logprintf (LOG_ALWAYS, "%s\n", escnonprint (line));
+ xfree (line);
+ }
+ fclose (fp);
+ }
} /* con->cmd & DO_LIST && server_response */
return RETRFINISHED;
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;
}
++count;
sleep_between_retrievals (count);
if (con->st & ON_YOUR_OWN)
- {
- con->cmd = 0;
- con->cmd |= (DO_RETR | LEAVE_PENDING);
- if (con->csock != -1)
- con->cmd &= ~ (DO_LOGIN | DO_CWD);
- else
- con->cmd |= (DO_LOGIN | DO_CWD);
- }
+ {
+ con->cmd = 0;
+ con->cmd |= (DO_RETR | LEAVE_PENDING);
+ if (con->csock != -1)
+ con->cmd &= ~ (DO_LOGIN | DO_CWD);
+ else
+ con->cmd |= (DO_LOGIN | DO_CWD);
+ }
else /* not on your own */
- {
- if (con->csock != -1)
- con->cmd &= ~DO_LOGIN;
- else
- con->cmd |= DO_LOGIN;
- if (con->st & DONE_CWD)
- con->cmd &= ~DO_CWD;
- else
- con->cmd |= DO_CWD;
- }
+ {
+ if (con->csock != -1)
+ con->cmd &= ~DO_LOGIN;
+ else
+ con->cmd |= DO_LOGIN;
+ if (con->st & DONE_CWD)
+ con->cmd &= ~DO_CWD;
+ else
+ con->cmd |= DO_CWD;
+ }
/* 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;
+ && 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 */
+ restval = len; /* start where the previous run left off */
else
- restval = 0;
+ restval = 0;
/* Get the current time string. */
tms = time_str (time (NULL));
/* Print fetch message, if opt.verbose. */
if (opt.verbose)
- {
- char *hurl = url_string (u, URL_AUTH_HIDE_PASSWD);
- 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);
+ {
+ char *hurl = url_string (u, URL_AUTH_HIDE_PASSWD);
+ 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);
+ ws_changetitle (hurl);
#endif
- xfree (hurl);
- }
+ xfree (hurl);
+ }
/* Send getftp the proper length, if fileinfo was provided. */
if (f)
- len = f->size;
+ len = f->size;
else
- len = 0;
+ len = 0;
err = getftp (u, &len, restval, con);
if (con->csock == -1)
- con->st &= ~DONE_CWD;
+ con->st &= ~DONE_CWD;
else
- con->st |= DONE_CWD;
+ con->st |= DONE_CWD;
switch (err)
- {
- case HOSTERR: case CONIMPOSSIBLE: case FWRITEERR: case FOPENERR:
- case FTPNSFOD: case FTPLOGINC: case FTPNOPASV: case CONTNOTSUPPORTED:
- /* Fatal errors, give up. */
- return err;
- 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;
- case FTPRETRINT:
- /* If the control connection was closed, the retrieval
- will be considered OK if f->size == len. */
- if (!f || len != f->size)
- {
- printwhat (count, opt.ntry);
- continue;
- }
- break;
- case RETRFINISHED:
- /* Great! */
- break;
- default:
- /* Not as great. */
- abort ();
- }
+ {
+ case HOSTERR: case CONIMPOSSIBLE: case FWRITEERR: case FOPENERR:
+ case FTPNSFOD: case FTPLOGINC: case FTPNOPASV: case CONTNOTSUPPORTED:
+ /* Fatal errors, give up. */
+ return err;
+ 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;
+ case FTPRETRINT:
+ /* If the control connection was closed, the retrieval
+ will be considered OK if f->size == len. */
+ if (!f || len != f->size)
+ {
+ printwhat (count, opt.ntry);
+ continue;
+ }
+ break;
+ case RETRFINISHED:
+ /* Great! */
+ break;
+ default:
+ /* Not as great. */
+ abort ();
+ }
tms = time_str (time (NULL));
if (!opt.spider)
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. */
+ successfully downloaded a file. Remember this fact. */
downloaded_file (FILE_DOWNLOADED_NORMALLY, locf);
if (con->st & ON_YOUR_OWN)
- {
- fd_close (con->csock);
- con->csock = -1;
- }
+ {
+ fd_close (con->csock);
+ con->csock = -1;
+ }
if (!opt.spider)
logprintf (LOG_VERBOSE, _("%s (%s) - `%s' saved [%s]\n\n"),
- tms, tmrate, locf, number_to_static_string (len));
+ 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
+ {
+ /* 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, URL_AUTH_HIDE_PASSWD);
- logprintf (LOG_NONVERBOSE, "%s URL: %s [%s] -> \"%s\" [%d]\n",
- tms, hurl, number_to_static_string (len), locf, count);
- xfree (hurl);
- }
+ char *hurl = url_string (u, URL_AUTH_HIDE_PASSWD);
+ logprintf (LOG_NONVERBOSE, "%s URL: %s [%s] -> \"%s\" [%d]\n",
+ tms, hurl, number_to_static_string (len), locf, count);
+ xfree (hurl);
+ }
if ((con->cmd & DO_LIST))
- /* This is a directory listing file. */
- {
- if (!opt.remove_listing)
- /* --dont-remove-listing was specified, so do count this towards the
- number of bytes and files downloaded. */
- {
- total_downloaded_bytes += len;
- opt.numurls++;
- }
-
- /* Deletion of listing files is not controlled by --delete-after, but
- by the more specific option --dont-remove-listing, and the code
- to do this deletion is in another function. */
- }
+ /* This is a directory listing file. */
+ {
+ if (!opt.remove_listing)
+ /* --dont-remove-listing was specified, so do count this towards the
+ number of bytes and files downloaded. */
+ {
+ total_downloaded_bytes += len;
+ opt.numurls++;
+ }
+
+ /* Deletion of listing files is not controlled by --delete-after, but
+ by the more specific option --dont-remove-listing, and the code
+ to do this deletion is in another function. */
+ }
else if (!opt.spider)
- /* This is not a directory listing file. */
- {
- /* Unlike directory listing files, don't pretend normal files weren't
- downloaded if they're going to be deleted. People seeding proxies,
- for instance, may want to know how many bytes and files they've
- downloaded through it. */
- total_downloaded_bytes += len;
- opt.numurls++;
-
- if (opt.delete_after)
- {
- DEBUGP (("\
+ /* This is not a directory listing file. */
+ {
+ /* Unlike directory listing files, don't pretend normal files weren't
+ downloaded if they're going to be deleted. People seeding proxies,
+ for instance, may want to know how many bytes and files they've
+ downloaded through it. */
+ total_downloaded_bytes += len;
+ opt.numurls++;
+
+ if (opt.delete_after)
+ {
+ 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));
- }
- }
+ logprintf (LOG_VERBOSE, _("Removing %s.\n"), locf);
+ if (unlink (locf))
+ logprintf (LOG_NOTQUIET, "unlink: %s\n", strerror (errno));
+ }
+ }
/* Restore the original leave-pendingness. */
if (orig_lp)
- con->cmd |= LEAVE_PENDING;
+ con->cmd |= LEAVE_PENDING;
else
- con->cmd &= ~LEAVE_PENDING;
+ con->cmd &= ~LEAVE_PENDING;
return RETROK;
} while (!opt.ntry || (count < opt.ntry));
ftp_get_listing (struct url *u, ccon *con, struct fileinfo **f)
{
uerr_t err;
- char *uf; /* url file name */
- char *lf; /* list file name */
+ char *uf; /* url file name */
+ char *lf; /* list file name */
char *old_target = con->target;
con->st &= ~ON_YOUR_OWN;
if (opt.remove_listing)
{
if (unlink (lf))
- logprintf (LOG_NOTQUIET, "unlink: %s\n", strerror (errno));
+ logprintf (LOG_NOTQUIET, "unlink: %s\n", strerror (errno));
else
- logprintf (LOG_VERBOSE, _("Removed `%s'.\n"), lf);
+ logprintf (LOG_VERBOSE, _("Removed `%s'.\n"), lf);
}
xfree (lf);
con->cmd &= ~DO_LIST;
if (opt.reclevel != INFINITE_RECURSION && depth > opt.reclevel)
{
DEBUGP ((_("Recursion depth %d exceeded max. depth %d.\n"),
- depth, opt.reclevel));
+ depth, opt.reclevel));
--depth;
return RECLEVELEXC;
}
else
con->cmd &= ~DO_LOGIN;
- err = RETROK; /* in case it's not used */
+ err = RETROK; /* in case it's not used */
while (f)
{
char *old_target, *ofile;
if (opt.quota && total_downloaded_bytes > opt.quota)
- {
- --depth;
- return QUOTEXC;
- }
+ {
+ --depth;
+ return QUOTEXC;
+ }
old_target = con->target;
ofile = xstrdup (u->file);
dlthis = true;
if (opt.timestamping && f->type == FT_PLAINFILE)
{
- struct_stat st;
- /* If conversion of HTML files retrieved via FTP is ever implemented,
- we'll need to stat() <file>.orig here when -K has been specified.
- I'm not implementing it now since files on an FTP server are much
- more likely than files on an HTTP server to legitimately have a
- .orig suffix. */
- if (!stat (con->target, &st))
- {
+ struct_stat st;
+ /* If conversion of HTML files retrieved via FTP is ever implemented,
+ we'll need to stat() <file>.orig here when -K has been specified.
+ I'm not implementing it now since files on an FTP server are much
+ more likely than files on an HTTP server to legitimately have a
+ .orig suffix. */
+ if (!stat (con->target, &st))
+ {
bool eq_size;
bool cor_val;
- /* Else, get it from the file. */
- local_size = st.st_size;
- tml = st.st_mtime;
+ /* Else, get it from the file. */
+ local_size = st.st_size;
+ tml = st.st_mtime;
#ifdef WINDOWS
- /* Modification time granularity is 2 seconds for Windows, so
- increase local time by 1 second for later comparison. */
- tml++;
+ /* Modification time granularity is 2 seconds for Windows, so
+ increase local time by 1 second for later comparison. */
+ tml++;
#endif
/* Compare file sizes only for servers that tell us correct
values. Assume 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) : true;
- if (f->tstamp <= tml && eq_size)
- {
- /* Remote file is older, file sizes can be compared and
+ 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 = false;
- }
- else if (eq_size)
+ dlthis = false;
+ }
+ else if (eq_size)
{
/* Remote file is newer or sizes cannot be matched */
logprintf (LOG_VERBOSE, _("\
/* Sizes do not match */
logprintf (LOG_VERBOSE, _("\
The sizes do not match (local %s) -- retrieving.\n\n"),
- number_to_static_string (local_size));
+ number_to_static_string (local_size));
}
}
- } /* opt.timestamping && f->type == FT_PLAINFILE */
+ } /* opt.timestamping && f->type == FT_PLAINFILE */
switch (f->type)
- {
- case FT_SYMLINK:
- /* If opt.retr_symlinks is defined, we treat symlinks as
- if they were normal files. There is currently no way
- to distinguish whether they might be directories, and
- follow them. */
- if (!opt.retr_symlinks)
- {
+ {
+ case FT_SYMLINK:
+ /* If opt.retr_symlinks is defined, we treat symlinks as
+ if they were normal files. There is currently no way
+ to distinguish whether they might be directories, and
+ follow them. */
+ if (!opt.retr_symlinks)
+ {
#ifdef HAVE_SYMLINK
- if (!f->linkto)
- logputs (LOG_NOTQUIET,
- _("Invalid name of the symlink, skipping.\n"));
- else
- {
+ if (!f->linkto)
+ logputs (LOG_NOTQUIET,
+ _("Invalid name of the symlink, skipping.\n"));
+ else
+ {
struct_stat st;
- /* Check whether we already have the correct
+ /* Check whether we already have the correct
symbolic link. */
int rc = lstat (con->target, &st);
if (rc == 0)
- {
- size_t len = strlen (f->linkto) + 1;
- if (S_ISLNK (st.st_mode))
- {
- char *link_target = (char *)alloca (len);
- size_t n = readlink (con->target, link_target, len);
- if ((n == len - 1)
- && (memcmp (link_target, f->linkto, n) == 0))
- {
- logprintf (LOG_VERBOSE, _("\
+ {
+ size_t len = strlen (f->linkto) + 1;
+ if (S_ISLNK (st.st_mode))
+ {
+ char *link_target = (char *)alloca (len);
+ size_t n = readlink (con->target, link_target, len);
+ if ((n == len - 1)
+ && (memcmp (link_target, f->linkto, n) == 0))
+ {
+ logprintf (LOG_VERBOSE, _("\
Already have correct symlink %s -> %s\n\n"),
- con->target, escnonprint (f->linkto));
+ con->target, escnonprint (f->linkto));
dlthis = false;
- break;
- }
- }
- }
- logprintf (LOG_VERBOSE, _("Creating symlink %s -> %s\n"),
- 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));
- logputs (LOG_VERBOSE, "\n");
- } /* have f->linkto */
+ break;
+ }
+ }
+ }
+ logprintf (LOG_VERBOSE, _("Creating symlink %s -> %s\n"),
+ 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));
+ logputs (LOG_VERBOSE, "\n");
+ } /* have f->linkto */
#else /* not HAVE_SYMLINK */
- logprintf (LOG_NOTQUIET,
- _("Symlinks not supported, skipping symlink `%s'.\n"),
- con->target);
+ logprintf (LOG_NOTQUIET,
+ _("Symlinks not supported, skipping symlink `%s'.\n"),
+ con->target);
#endif /* not HAVE_SYMLINK */
- }
- else /* opt.retr_symlinks */
- {
- if (dlthis)
- err = ftp_loop_internal (u, f, con);
- } /* opt.retr_symlinks */
- break;
- case FT_DIRECTORY:
- if (!opt.recursive)
- logprintf (LOG_NOTQUIET, _("Skipping directory `%s'.\n"),
- escnonprint (f->name));
- break;
- case FT_PLAINFILE:
- /* Call the retrieve loop. */
- if (dlthis)
- err = ftp_loop_internal (u, f, con);
- break;
- case FT_UNKNOWN:
- logprintf (LOG_NOTQUIET, _("%s: unknown/unsupported file type.\n"),
- escnonprint (f->name));
- break;
- } /* switch */
+ }
+ else /* opt.retr_symlinks */
+ {
+ if (dlthis)
+ err = ftp_loop_internal (u, f, con);
+ } /* opt.retr_symlinks */
+ break;
+ case FT_DIRECTORY:
+ if (!opt.recursive)
+ logprintf (LOG_NOTQUIET, _("Skipping directory `%s'.\n"),
+ escnonprint (f->name));
+ break;
+ case FT_PLAINFILE:
+ /* Call the retrieve loop. */
+ if (dlthis)
+ err = ftp_loop_internal (u, f, con);
+ break;
+ case FT_UNKNOWN:
+ logprintf (LOG_NOTQUIET, _("%s: unknown/unsupported file type.\n"),
+ escnonprint (f->name));
+ break;
+ } /* switch */
/* Set the time-stamp information to the local file. Symlinks
- are not to be stamped because it sets the stamp on the
- original. :( */
+ are not to be stamped because it sets the stamp on the
+ original. :( */
if (!(f->type == FT_SYMLINK && !opt.retr_symlinks)
- && f->tstamp != -1
+ && f->tstamp != -1
&& dlthis
- && file_exists_p (con->target))
- {
- /* #### This code repeats in http.c and ftp.c. Move it to a
+ && file_exists_p (con->target))
+ {
+ /* #### This code repeats in http.c and ftp.c. Move it to a
function! */
- const char *fl = NULL;
- if (opt.output_document)
- {
- if (output_stream_regular)
- fl = opt.output_document;
- }
- else
- fl = con->target;
- if (fl)
- touch (fl, f->tstamp);
- }
+ const char *fl = NULL;
+ if (opt.output_document)
+ {
+ if (output_stream_regular)
+ fl = opt.output_document;
+ }
+ else
+ fl = con->target;
+ if (fl)
+ touch (fl, f->tstamp);
+ }
else if (f->tstamp == -1)
- logprintf (LOG_NOTQUIET, _("%s: corrupt time-stamp.\n"), con->target);
+ logprintf (LOG_NOTQUIET, _("%s: corrupt time-stamp.\n"), con->target);
if (f->perms && f->type == FT_PLAINFILE && dlthis)
{
- if (opt.preserve_perm)
- chmod (con->target, f->perms);
+ if (opt.preserve_perm)
+ chmod (con->target, f->perms);
}
else
- DEBUGP (("Unrecognized permissions for %s.\n", con->target));
+ DEBUGP (("Unrecognized permissions for %s.\n", con->target));
xfree (con->target);
con->target = old_target;
/* Break on fatals. */
if (err == QUOTEXC || err == HOSTERR || err == FWRITEERR)
- break;
+ break;
con->cmd &= ~ (DO_CWD | DO_LOGIN);
f = f->next;
}
err = ftp_retrieve_dirs (u, orig, con);
else if (opt.recursive)
DEBUGP ((_("Will not retrieve dirs since depth is %d (max %d).\n"),
- depth, opt.reclevel));
+ depth, opt.reclevel));
--depth;
return err;
}
char *odir, *newdir;
if (opt.quota && total_downloaded_bytes > opt.quota)
- break;
+ break;
if (f->type != FT_DIRECTORY)
- continue;
+ continue;
/* Allocate u->dir off stack, but reallocate only if a larger
string is needed. It's a pity there's no "realloca" for an
item on the bottom of the stack. */
size = strlen (u->dir) + 1 + strlen (f->name) + 1;
if (size > container_size)
- container = (char *)alloca (size);
+ container = (char *)alloca (size);
newdir = container;
odir = u->dir;
if (*odir == '\0'
- || (*odir == '/' && *(odir + 1) == '\0'))
- /* If ODIR is empty or just "/", simply append f->name to
- ODIR. (In the former case, to preserve u->dir being
- relative; in the latter case, to avoid double slash.) */
- sprintf (newdir, "%s%s", odir, f->name);
+ || (*odir == '/' && *(odir + 1) == '\0'))
+ /* If ODIR is empty or just "/", simply append f->name to
+ ODIR. (In the former case, to preserve u->dir being
+ relative; in the latter case, to avoid double slash.) */
+ sprintf (newdir, "%s%s", odir, f->name);
else
- /* Else, use a separator. */
- sprintf (newdir, "%s/%s", odir, f->name);
+ /* Else, use a separator. */
+ sprintf (newdir, "%s/%s", odir, f->name);
DEBUGP (("Composing new CWD relative to the initial directory.\n"));
DEBUGP ((" odir = '%s'\n f->name = '%s'\n newdir = '%s'\n\n",
- odir, f->name, newdir));
+ odir, f->name, newdir));
if (!accdir (newdir))
- {
- logprintf (LOG_VERBOSE, _("\
+ {
+ logprintf (LOG_VERBOSE, _("\
Not descending to `%s' as it is excluded/not-included.\n"),
- escnonprint (newdir));
- continue;
- }
+ escnonprint (newdir));
+ continue;
+ }
con->st &= ~DONE_CWD;
- odir = xstrdup (u->dir); /* because url_set_dir will free
- u->dir. */
+ odir = xstrdup (u->dir); /* because url_set_dir will free
+ u->dir. */
url_set_dir (u, newdir);
ftp_retrieve_glob (u, con, GLOB_GETALL);
url_set_dir (u, odir);
{
f = start;
while (f)
- {
- if (f->type != FT_DIRECTORY && !acceptable (f->name))
- {
- logprintf (LOG_VERBOSE, _("Rejecting `%s'.\n"),
- escnonprint (f->name));
- f = delelement (f, &start);
- }
- else
- f = f->next;
- }
+ {
+ if (f->type != FT_DIRECTORY && !acceptable (f->name))
+ {
+ logprintf (LOG_VERBOSE, _("Rejecting `%s'.\n"),
+ escnonprint (f->name));
+ f = delelement (f, &start);
+ }
+ else
+ f = f->next;
+ }
}
/* Remove all files with possible harmful names */
f = start;
while (f)
{
if (has_insecure_name_p (f->name))
- {
- logprintf (LOG_VERBOSE, _("Rejecting `%s'.\n"),
- escnonprint (f->name));
- f = delelement (f, &start);
- }
+ {
+ logprintf (LOG_VERBOSE, _("Rejecting `%s'.\n"),
+ escnonprint (f->name));
+ f = delelement (f, &start);
+ }
else
- f = f->next;
+ f = f->next;
}
/* 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 == GLOB_GLOBALL || action == GLOB_GETONE))
{
int (*matcher) (const char *, const char *, int)
- = opt.ignore_case ? fnmatch_nocase : fnmatch;
+ = opt.ignore_case ? fnmatch_nocase : fnmatch;
int matchres = 0;
f = start;
while (f)
- {
- matchres = matcher (u->file, f->name, 0);
- if (matchres == -1)
- {
- logprintf (LOG_NOTQUIET, "%s: %s\n", con->target,
- strerror (errno));
- break;
- }
- if (matchres == FNM_NOMATCH)
- f = delelement (f, &start); /* delete the element from the list */
- else
- f = f->next; /* leave the element in the list */
- }
+ {
+ matchres = matcher (u->file, f->name, 0);
+ if (matchres == -1)
+ {
+ logprintf (LOG_NOTQUIET, "%s: %s\n", con->target,
+ strerror (errno));
+ break;
+ }
+ if (matchres == FNM_NOMATCH)
+ f = delelement (f, &start); /* delete the element from the list */
+ else
+ f = f->next; /* leave the element in the list */
+ }
if (matchres == -1)
- {
- freefileinfo (start);
- return RETRBADPATTERN;
- }
+ {
+ freefileinfo (start);
+ return RETRBADPATTERN;
+ }
}
if (start)
{
else if (!start)
{
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"),
- escnonprint (u->file));
- }
+ {
+ /* 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"),
+ escnonprint (u->file));
+ }
else /* GLOB_GETONE or GLOB_GETALL */
- {
- /* Let's try retrieving it anyway. */
- con->st |= ON_YOUR_OWN;
- res = ftp_loop_internal (u, NULL, con);
- return res;
- }
+ {
+ /* Let's try retrieving it anyway. */
+ con->st |= ON_YOUR_OWN;
+ res = ftp_loop_internal (u, NULL, con);
+ return res;
+ }
}
freefileinfo (start);
if (opt.quota && total_downloaded_bytes > opt.quota)
uerr_t
ftp_loop (struct url *u, int *dt, struct url *proxy, bool recursive, bool glob)
{
- ccon con; /* FTP connection */
+ ccon con; /* FTP connection */
uerr_t res;
*dt = 0;
res = ftp_get_listing (u, &con, &f);
if (res == RETROK)
- {
- if (opt.htmlify && !opt.spider)
- {
- char *filename = (opt.output_document
- ? xstrdup (opt.output_document)
- : (con.target ? xstrdup (con.target)
- : url_file_name (u)));
- res = ftp_index (filename, u, f);
- if (res == FTPOK && opt.verbose)
- {
- if (!opt.output_document)
- {
- 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' [%s].\n"),
- filename, number_to_static_string (sz));
- }
- else
- logprintf (LOG_NOTQUIET,
- _("Wrote HTML-ized index to `%s'.\n"),
- filename);
- }
- xfree (filename);
- }
- freefileinfo (f);
- }
+ {
+ if (opt.htmlify && !opt.spider)
+ {
+ char *filename = (opt.output_document
+ ? xstrdup (opt.output_document)
+ : (con.target ? xstrdup (con.target)
+ : url_file_name (u)));
+ res = ftp_index (filename, u, f);
+ if (res == FTPOK && opt.verbose)
+ {
+ if (!opt.output_document)
+ {
+ 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' [%s].\n"),
+ filename, number_to_static_string (sz));
+ }
+ else
+ logprintf (LOG_NOTQUIET,
+ _("Wrote HTML-ized index to `%s'.\n"),
+ filename);
+ }
+ xfree (filename);
+ }
+ freefileinfo (f);
+ }
}
else
{
bool ispattern = false;
if (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);
- }
+ {
+ /* 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 || 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,
- ispattern ? GLOB_GLOBALL : GLOB_GETONE);
- }
+ {
+ /* 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,
+ ispattern ? GLOB_GLOBALL : GLOB_GETONE);
+ }
else
- res = ftp_loop_internal (u, NULL, &con);
+ res = ftp_loop_internal (u, NULL, &con);
}
if (res == FTPOK)
res = RETROK;
struct fileinfo *next = f->next;
xfree (f->name);
if (f->linkto)
- xfree (f->linkto);
+ xfree (f->linkto);
xfree (f);
f = next;
}
projects / wget / blobdiff