#include "retr.h"
#include "recur.h"
#include "host.h"
-#include "cookies.h"
#include "url.h"
#include "progress.h" /* for progress_handle_sigwinch */
#include "convert.h"
{ "follow-tags", 0, OPT_VALUE, "followtags", -1 },
{ "force-directories", 'x', OPT_BOOLEAN, "dirstruct", -1 },
{ "force-html", 'F', OPT_BOOLEAN, "forcehtml", -1 },
+ { "ftp-passwd", 0, OPT_VALUE, "ftppasswd", -1 },
{ "glob", 0, OPT_BOOLEAN, "glob", -1 },
{ "header", 0, OPT_VALUE, "header", -1 },
{ "help", 'h', OPT_FUNCALL, (void *)print_help, no_argument },
N_("\
--no-glob turn off FTP file name globbing.\n"),
N_("\
- --passive-ftp use the \"passive\" transfer mode.\n"),
+ --no-passive-ftp disable the \"passive\" transfer mode.\n"),
N_("\
--retr-symlinks when recursing, get linked-to files (not dir).\n"),
N_("\
#ifdef WINDOWS
/* Drop extension (typically .EXE) from executable filename. */
- windows_main_junk (&argc, (char **) argv, (char **) &exec_name);
+ windows_main (&argc, (char **) argv, (char **) &exec_name);
#endif
/* Set option defaults; read the system wgetrc and ~/.wgetrc. */
break;
case OPT_FUNCALL:
{
- void (*func) PARAMS ((void)) = opt->data;
+ void (*func) PARAMS ((void)) = (void (*) PARAMS ((void))) opt->data;
func ();
}
break;
output_stream = stdout;
else
{
- struct stat st;
+ struct_stat st;
output_stream = fopen (opt.output_document,
opt.always_rest ? "ab" : "wb");
if (output_stream == NULL)
{
logprintf (LOG_NOTQUIET,
_("\nFINISHED --%s--\nDownloaded: %s bytes in %d files\n"),
- time_str (NULL), legible_large_int (total_downloaded_bytes),
+ time_str (NULL), with_thousand_seps_large (total_downloaded_bytes),
opt.numurls);
/* Print quota warning, if exceeded. */
if (opt.quota && total_downloaded_bytes > opt.quota)
logprintf (LOG_NOTQUIET,
_("Download quota (%s bytes) EXCEEDED!\n"),
- legible (opt.quota));
+ with_thousand_seps_large (opt.quota));
}
- if (opt.cookies_output && wget_cookie_jar)
- cookie_jar_save (wget_cookie_jar, opt.cookies_output);
+ if (opt.cookies_output)
+ save_cookies ();
if (opt.convert_links && !opt.delete_after)
convert_all_links ();