#include "recur.h"
#include "netrc.h"
#include "cookies.h" /* for cookies_cleanup */
+#include "progress.h"
#ifndef errno
extern int errno;
CMD_DECLARE (cmd_spec_header);
CMD_DECLARE (cmd_spec_htmlify);
CMD_DECLARE (cmd_spec_mirror);
-/*CMD_DECLARE (cmd_spec_progress);*/
+CMD_DECLARE (cmd_spec_progress);
CMD_DECLARE (cmd_spec_recursive);
CMD_DECLARE (cmd_spec_useragent);
{ "dotbytes", &opt.dot_bytes, cmd_bytes },
{ "dotsinline", &opt.dots_in_line, cmd_number },
{ "dotspacing", &opt.dot_spacing, cmd_number },
+ { "dotstyle", &opt.dot_style, cmd_string },
{ "excludedirectories", &opt.excludes, cmd_directory_vector },
{ "excludedomains", &opt.exclude_domains, cmd_vector },
{ "followftp", &opt.follow_ftp, cmd_boolean },
{ "includedirectories", &opt.includes, cmd_directory_vector },
{ "input", &opt.input_filename, cmd_file },
{ "killlonger", &opt.kill_longer, cmd_boolean },
+ { "limitrate", &opt.limit_rate, cmd_bytes },
{ "loadcookies", &opt.cookies_input, cmd_file },
{ "logfile", &opt.lfilename, cmd_file },
{ "login", &opt.ftp_acc, cmd_string },
{ "pagerequisites", &opt.page_requisites, cmd_boolean },
{ "passiveftp", &opt.ftp_pasv, cmd_lockable_boolean },
{ "passwd", &opt.ftp_pass, cmd_string },
- { "progress", &opt.progress_type, cmd_string },
+ { "progress", &opt.progress_type, cmd_spec_progress },
{ "proxypasswd", &opt.proxy_passwd, cmd_string },
{ "proxyuser", &opt.proxy_user, cmd_string },
{ "quiet", &opt.quiet, cmd_boolean },
{ "quota", &opt.quota, cmd_bytes },
+ { "randomwait", &opt.random_wait, cmd_boolean },
{ "reclevel", &opt.reclevel, cmd_number_inf },
{ "recursive", NULL, cmd_spec_recursive },
{ "referer", &opt.referer, cmd_string },
#ifdef HAVE_SSL
{ "sslcertfile", &opt.sslcertfile, cmd_file },
{ "sslcertkey", &opt.sslcertkey, cmd_file },
+ { "egdfile", &opt.sslegdsock, cmd_file },
#endif /* HAVE_SSL */
{ "timeout", &opt.timeout, cmd_time },
{ "timestamping", &opt.timestamping, cmd_boolean },
{
if (!file_exists_p (env))
{
- fprintf (stderr, "%s: %s: %s.\n", exec_name, file, strerror (errno));
+ fprintf (stderr, "%s: %s: %s.\n", exec_name, env, strerror (errno));
exit (1);
}
return xstrdup (env);
static int
cmd_address (const char *com, const char *val, void *closure)
{
+ struct address_list *al;
struct sockaddr_in sin;
struct sockaddr_in **target = (struct sockaddr_in **)closure;
memset (&sin, '\0', sizeof (sin));
- if (!lookup_host (val, (unsigned char *)&sin.sin_addr))
+ al = lookup_host (val, 1);
+ if (!al)
{
fprintf (stderr, _("%s: %s: Cannot convert `%s' to an IP address.\n"),
exec_name, com, val);
return 0;
}
+ address_list_copy_one (al, 0, (unsigned char *)&sin.sin_addr);
+ address_list_release (al);
+
sin.sin_family = AF_INET;
sin.sin_port = 0;
char **pstring = (char **)closure;
FREE_MAYBE (*pstring);
+
+ /* #### If VAL is empty, perhaps should set *CLOSURE to NULL. */
+
if (!enable_tilde_expansion || !(*val == '~' && *(val + 1) == '/'))
{
noexpand:
return 1;
}
-#if 0
static int
cmd_spec_progress (const char *com, const char *val, void *closure)
{
exec_name, com, val);
return 0;
}
- set_progress_implementation (val);
+ FREE_MAYBE (opt.progress_type);
+
+ /* Don't call set_progress_implementation here. It will be called
+ in main() when it becomes clear what the log output is. */
+ opt.progress_type = xstrdup (val);
return 1;
}
-#endif
static int
cmd_spec_recursive (const char *com, const char *val, void *closure)
void cleanup_html_url PARAMS ((void));
void res_cleanup PARAMS ((void));
void downloaded_files_free PARAMS ((void));
+void http_cleanup PARAMS ((void));
/* Free the memory allocated by global variables. */
#ifdef DEBUG_MALLOC
recursive_cleanup ();
res_cleanup ();
+ http_cleanup ();
+ cleanup_html_url ();
+ downloaded_files_free ();
+ cookies_cleanup ();
host_cleanup ();
+
{
extern acc_t *netrc_list;
free_netrc (netrc_list);
}
- cleanup_html_url ();
- downloaded_files_free ();
- cookies_cleanup ();
FREE_MAYBE (opt.lfilename);
xfree (opt.dir_prefix);
FREE_MAYBE (opt.input_filename);