X-Git-Url: http://sjero.net/git/?a=blobdiff_plain;f=src%2Fmain.c;h=4eed7df9e1fcff4e4c81cfe12e6d76ce005c44d0;hb=d5be8ecca466601bda9b81c28a79077fbda6ccde;hp=cb724787615ea5e9da92636992d6f4be074dd3c7;hpb=4454f6ce0a4ffde97887adf2abb36833924124fe;p=wget diff --git a/src/main.c b/src/main.c index cb724787..4eed7df9 100644 --- a/src/main.c +++ b/src/main.c @@ -1,27 +1,27 @@ /* Command line parsing. - Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc. + Copyright (C) 1995, 1996, 1997, 1998, 2000, 2001 + Free Software Foundation, Inc. -This file is part of Wget. +This file is part of GNU Wget. -This program is free software; you can redistribute it and/or modify +GNU Wget is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. -This program is distributed in the hope that it will be useful, +GNU Wget is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software +along with Wget; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #include #include #include -#include #ifdef HAVE_UNISTD_H # include #endif /* HAVE_UNISTD_H */ @@ -39,16 +39,21 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ # include #endif /* HAVE_LOCALE_H */ #endif /* HAVE_NLS */ +#include #define OPTIONS_DEFINED_HERE /* for options.h */ #include "wget.h" #include "utils.h" -#include "getopt.h" #include "init.h" #include "retr.h" #include "recur.h" #include "host.h" +#include "cookies.h" +#include "url.h" + +/* On GNU system this will include system-wide getopt.h. */ +#include "getopt.h" #ifndef PATH_SEPARATOR # define PATH_SEPARATOR '/' @@ -87,12 +92,29 @@ i18n_initialize (void) things up. For example, when in a foreign locale, Solaris strptime() fails to handle international dates correctly, which makes http_atotm() malfunction. */ +#ifdef LC_MESSAGES setlocale (LC_MESSAGES, ""); + setlocale (LC_CTYPE, ""); +#else + setlocale (LC_ALL, ""); +#endif /* Set the text message domain. */ bindtextdomain ("wget", LOCALEDIR); textdomain ("wget"); #endif /* HAVE_NLS */ } + +/* It's kosher to declare these here because their interface _has_ to + be void foo(void). */ +void host_init PARAMS ((void)); + +/* This just calls the various initialization functions from the + modules that need one-time initialization. */ +static void +private_initialize (void) +{ + host_init (); +} /* Print the usage message. */ static void @@ -111,16 +133,18 @@ print_help (void) print_usage (); /* Had to split this in parts, so the #@@#%# Ultrix compiler and cpp don't bitch. Also, it makes translation much easier. */ - printf ("%s%s%s%s%s%s%s%s%s%s", _("\ + fputs (_("\ \n\ Mandatory arguments to long options are mandatory for short options too.\n\ -\n"), _("\ +\n"), stdout); + fputs (_("\ Startup:\n\ -V, --version display the version of Wget and exit.\n\ -h, --help print this help.\n\ -b, --background go to background after startup.\n\ - -e, --execute=COMMAND execute a `.wgetrc\' command.\n\ -\n"), _("\ + -e, --execute=COMMAND execute a `.wgetrc\'-style command.\n\ +\n"), stdout); + fputs (_("\ Logging and input file:\n\ -o, --output-file=FILE log messages to FILE.\n\ -a, --append-output=FILE append messages to FILE.\n\ @@ -128,56 +152,73 @@ Logging and input file:\n\ -q, --quiet quiet (no output).\n\ -v, --verbose be verbose (this is the default).\n\ -nv, --non-verbose turn off verboseness, without being quiet.\n\ - -i, --input-file=FILE read URL-s from file.\n\ + -i, --input-file=FILE download URLs found in FILE.\n\ -F, --force-html treat input file as HTML.\n\ -\n"), _("\ + -B, --base=URL prepends URL to relative links in -F -i file.\n\ + --sslcertfile=FILE optional client certificate.\n\ + --sslcertkey=KEYFILE optional keyfile for this certificate.\n\ +\n"), stdout); + fputs (_("\ Download:\n\ + --bind-address=ADDRESS bind to ADDRESS (hostname or IP) on local host.\n\ -t, --tries=NUMBER set number of retries to NUMBER (0 unlimits).\n\ -O --output-document=FILE write documents to FILE.\n\ - -nc, --no-clobber don\'t clobber existing files.\n\ - -c, --continue restart getting an existing file.\n\ + -nc, --no-clobber don\'t clobber existing files or use .# suffixes.\n\ + -c, --continue resume getting a partially-downloaded file.\n\ --dot-style=STYLE set retrieval display style.\n\ - -N, --timestamping don\'t retrieve files if older than local.\n\ + -N, --timestamping don\'t re-retrieve files unless newer than local.\n\ -S, --server-response print server response.\n\ --spider don\'t download anything.\n\ -T, --timeout=SECONDS set the read timeout to SECONDS.\n\ -w, --wait=SECONDS wait SECONDS between retrievals.\n\ - --waitretry=SECONDS wait 0..max SECONDS between retries of a retrieval.\n\ + --waitretry=SECONDS wait 1...SECONDS between retries of a retrieval.\n\ -Y, --proxy=on/off turn proxy on or off.\n\ -Q, --quota=NUMBER set retrieval quota to NUMBER.\n\ -\n"), _("\ +\n"), stdout); + fputs (_("\ Directories:\n\ -nd --no-directories don\'t create directories.\n\ -x, --force-directories force creation of directories.\n\ -nH, --no-host-directories don\'t create host directories.\n\ -P, --directory-prefix=PREFIX save files to PREFIX/...\n\ --cut-dirs=NUMBER ignore NUMBER remote directory components.\n\ -\n"), _("\ +\n"), stdout); + fputs (_("\ HTTP options:\n\ --http-user=USER set http user to USER.\n\ --http-passwd=PASS set http password to PASS.\n\ -C, --cache=on/off (dis)allow server-cached data (normally allowed).\n\ + -E, --html-extension save all text/html documents with .html extension.\n\ --ignore-length ignore `Content-Length\' header field.\n\ --header=STRING insert STRING among the headers.\n\ --proxy-user=USER set USER as proxy username.\n\ --proxy-passwd=PASS set PASS as proxy password.\n\ + --referer=URL include `Referer: URL\' header in HTTP request.\n\ -s, --save-headers save the HTTP headers to file.\n\ -U, --user-agent=AGENT identify as AGENT instead of Wget/VERSION.\n\ -\n"), _("\ + --no-http-keep-alive disable HTTP keep-alive (persistent connections).\n\ + --cookies=off don't use cookies.\n\ + --load-cookies=FILE load cookies from FILE before session.\n\ + --save-cookies=FILE save cookies to FILE after session.\n\ +\n"), stdout); + fputs (_("\ FTP options:\n\ - --retr-symlinks retrieve FTP symbolic links.\n\ - -g, --glob=on/off turn file name globbing on or off.\n\ - --passive-ftp use the \"passive\" transfer mode.\n\ -\n"), _("\ -Recursive retrieval:\n\ - -r, --recursive recursive web-suck -- use with care!.\n\ - -l, --level=NUMBER maximum recursion depth (0 to unlimit).\n\ - --delete-after delete downloaded files.\n\ - -k, --convert-links convert non-relative links to relative.\n\ - -K, --backup-converted before converting file X, back up as X.orig.\n\ - -m, --mirror turn on options suitable for mirroring.\n\ -nr, --dont-remove-listing don\'t remove `.listing\' files.\n\ -\n"), _("\ + -g, --glob=on/off turn file name globbing on or off.\n\ + --passive-ftp use the \"passive\" transfer mode.\n\ + --retr-symlinks when recursing, get linked-to files (not dirs).\n\ +\n"), stdout); + fputs (_("\ +Recursive retrieval:\n\ + -r, --recursive recursive web-suck -- use with care!\n\ + -l, --level=NUMBER maximum recursion depth (inf or 0 for infinite).\n\ + --delete-after delete files locally after downloading them.\n\ + -k, --convert-links convert non-relative links to relative.\n\ + -K, --backup-converted before converting file X, back up as X.orig.\n\ + -m, --mirror shortcut option equivalent to -r -N -l inf -nr.\n\ + -p, --page-requisites get all images, etc. needed to display HTML page.\n\ +\n"), stdout); + fputs (_("\ Recursive accept/reject:\n\ -A, --accept=LIST comma-separated list of accepted extensions.\n\ -R, --reject=LIST comma-separated list of rejected extensions.\n\ @@ -192,7 +233,9 @@ Recursive accept/reject:\n\ -X, --exclude-directories=LIST list of excluded directories.\n\ -nh, --no-host-lookup don\'t DNS-lookup hosts.\n\ -np, --no-parent don\'t ascend to the parent directory.\n\ -\n"), _("Mail bug reports and suggestions to .\n")); +\n"), stdout); + fputs (_("Mail bug reports and suggestions to .\n"), + stdout); } int @@ -200,40 +243,42 @@ main (int argc, char *const *argv) { char **url, **t; int i, c, nurl, status, append_to_log; - int wr = 0; static struct option long_options[] = { /* Options without arguments: */ { "background", no_argument, NULL, 'b' }, + { "backup-converted", no_argument, NULL, 'K' }, { "continue", no_argument, NULL, 'c' }, { "convert-links", no_argument, NULL, 'k' }, - { "backup-converted", no_argument, NULL, 'K' }, { "debug", no_argument, NULL, 'd' }, - { "dont-remove-listing", no_argument, NULL, 21 }, - { "email-address", no_argument, NULL, 'E' }, /* undocumented (debug) */ - { "follow-ftp", no_argument, NULL, 14 }, + { "delete-after", no_argument, NULL, 136 }, + { "dont-remove-listing", no_argument, NULL, 149 }, + { "follow-ftp", no_argument, NULL, 142 }, { "force-directories", no_argument, NULL, 'x' }, { "force-hier", no_argument, NULL, 'x' }, /* obsolete */ { "force-html", no_argument, NULL, 'F'}, { "help", no_argument, NULL, 'h' }, - { "ignore-length", no_argument, NULL, 10 }, + { "html-extension", no_argument, NULL, 'E' }, + { "ignore-length", no_argument, NULL, 138 }, { "mirror", no_argument, NULL, 'm' }, - { "no-clobber", no_argument, NULL, 13 }, - { "no-directories", no_argument, NULL, 19 }, - { "no-host-directories", no_argument, NULL, 20 }, - { "no-host-lookup", no_argument, NULL, 22 }, - { "no-parent", no_argument, NULL, 5 }, - { "non-verbose", no_argument, NULL, 18 }, - { "passive-ftp", no_argument, NULL, 11 }, + { "no-clobber", no_argument, NULL, 141 }, + { "no-directories", no_argument, NULL, 147 }, + { "no-host-directories", no_argument, NULL, 148 }, + { "no-host-lookup", no_argument, NULL, 150 }, + { "no-http-keep-alive", no_argument, NULL, 156 }, + { "no-parent", no_argument, NULL, 133 }, + { "non-verbose", no_argument, NULL, 146 }, + { "passive-ftp", no_argument, NULL, 139 }, + { "page-requisites", no_argument, NULL, 'p' }, { "quiet", no_argument, NULL, 'q' }, { "recursive", no_argument, NULL, 'r' }, { "relative", no_argument, NULL, 'L' }, - { "retr-symlinks", no_argument, NULL, 9 }, + { "retr-symlinks", no_argument, NULL, 137 }, { "save-headers", no_argument, NULL, 's' }, { "server-response", no_argument, NULL, 'S' }, { "span-hosts", no_argument, NULL, 'H' }, - { "spider", no_argument, NULL, 4 }, + { "spider", no_argument, NULL, 132 }, { "timestamping", no_argument, NULL, 'N' }, { "verbose", no_argument, NULL, 'v' }, { "version", no_argument, NULL, 'V' }, @@ -241,46 +286,54 @@ main (int argc, char *const *argv) /* Options accepting an argument: */ { "accept", required_argument, NULL, 'A' }, { "append-output", required_argument, NULL, 'a' }, - { "backups", required_argument, NULL, 23 }, /* undocumented */ + { "backups", required_argument, NULL, 151 }, /* undocumented */ { "base", required_argument, NULL, 'B' }, + { "bind-address", required_argument, NULL, 155 }, { "cache", required_argument, NULL, 'C' }, - { "cut-dirs", required_argument, NULL, 17 }, - { "delete-after", no_argument, NULL, 8 }, + { "cookies", required_argument, NULL, 160 }, + { "cut-dirs", required_argument, NULL, 145 }, { "directory-prefix", required_argument, NULL, 'P' }, { "domains", required_argument, NULL, 'D' }, - { "dot-style", required_argument, NULL, 6 }, + { "dot-style", required_argument, NULL, 134 }, { "execute", required_argument, NULL, 'e' }, { "exclude-directories", required_argument, NULL, 'X' }, - { "exclude-domains", required_argument, NULL, 12 }, - { "follow-tags", required_argument, NULL, 25 }, + { "exclude-domains", required_argument, NULL, 140 }, + { "follow-tags", required_argument, NULL, 153 }, { "glob", required_argument, NULL, 'g' }, - { "header", required_argument, NULL, 3 }, - { "htmlify", required_argument, NULL, 7 }, - { "http-passwd", required_argument, NULL, 2 }, - { "http-user", required_argument, NULL, 1 }, + { "header", required_argument, NULL, 131 }, + { "htmlify", required_argument, NULL, 135 }, + { "http-passwd", required_argument, NULL, 130 }, + { "http-user", required_argument, NULL, 129 }, { "ignore-tags", required_argument, NULL, 'G' }, { "include-directories", required_argument, NULL, 'I' }, { "input-file", required_argument, NULL, 'i' }, { "level", required_argument, NULL, 'l' }, + { "load-cookies", required_argument, NULL, 161 }, { "no", required_argument, NULL, 'n' }, { "output-document", required_argument, NULL, 'O' }, { "output-file", required_argument, NULL, 'o' }, { "proxy", required_argument, NULL, 'Y' }, - { "proxy-passwd", required_argument, NULL, 16 }, - { "proxy-user", required_argument, NULL, 15 }, + { "proxy-passwd", required_argument, NULL, 144 }, + { "proxy-user", required_argument, NULL, 143 }, { "quota", required_argument, NULL, 'Q' }, { "reject", required_argument, NULL, 'R' }, + { "save-cookies", required_argument, NULL, 162 }, { "timeout", required_argument, NULL, 'T' }, { "tries", required_argument, NULL, 't' }, { "user-agent", required_argument, NULL, 'U' }, - { "referer", required_argument, NULL, 129 }, /* undocumented */ + { "referer", required_argument, NULL, 157 }, { "use-proxy", required_argument, NULL, 'Y' }, +#ifdef HAVE_SSL + { "sslcertfile", required_argument, NULL, 158 }, + { "sslcertkey", required_argument, NULL, 159 }, +#endif /* HAVE_SSL */ { "wait", required_argument, NULL, 'w' }, - { "waitretry", required_argument, NULL, 24 }, /* partially undocumented */ + { "waitretry", required_argument, NULL, 152 }, { 0, 0, 0, 0 } }; i18n_initialize (); + private_initialize (); append_to_log = 0; @@ -295,57 +348,67 @@ main (int argc, char *const *argv) windows_main_junk (&argc, (char **) argv, (char **) &exec_name); #endif - initialize (); + initialize (); /* sets option defaults; reads the system wgetrc and .wgetrc */ + /* [Is the order of the option letters significant? If not, they should be + alphabetized, like the long_options. The only thing I know for sure is + that the options with required arguments must be followed by a ':'. + -- Dan Harkless ] */ while ((c = getopt_long (argc, argv, "\ -hVqvdkKsxmNWrHSLcFbEY:G:g:T:U:O:l:n:i:o:a:t:D:A:R:P:B:e:Q:X:I:w:", +hpVqvdkKsxmNWrHSLcFbEY:G:g:T:U:O:l:n:i:o:a:t:D:A:R:P:B:e:Q:X:I:w:C:", long_options, (int *)0)) != EOF) { switch (c) { /* Options without arguments: */ - case 4: + case 132: setval ("spider", "on"); break; - case 5: + case 133: setval ("noparent", "on"); break; - case 8: + case 136: setval ("deleteafter", "on"); break; - case 9: + case 137: setval ("retrsymlinks", "on"); break; - case 10: + case 138: setval ("ignorelength", "on"); break; - case 11: + case 139: setval ("passiveftp", "on"); break; - case 13: + case 141: setval ("noclobber", "on"); break; - case 14: + case 142: setval ("followftp", "on"); break; - case 17: + case 145: setval ("cutdirs", optarg); break; - case 18: + case 146: setval ("verbose", "off"); break; - case 19: + case 147: setval ("dirstruct", "off"); break; - case 20: + case 148: setval ("addhostdir", "off"); break; - case 21: + case 149: setval ("removelisting", "off"); break; - case 22: + case 150: setval ("simplehostcheck", "on"); break; + case 155: + setval ("bindaddress", optarg); + break; + case 156: + setval ("httpkeepalive", "off"); + break; case 'b': setval ("background", "on"); break; @@ -361,9 +424,7 @@ hVqvdkKsxmNWrHSLcFbEY:G:g:T:U:O:l:n:i:o:a:t:D:A:R:P:B:e:Q:X:I:w:", #endif /* not DEBUG */ break; case 'E': - /* For debugging purposes. */ - printf ("%s\n", ftp_getaddress ()); - exit (0); + setval ("htmlextension", "on"); break; case 'F': setval ("forcehtml", "on"); @@ -393,6 +454,9 @@ hVqvdkKsxmNWrHSLcFbEY:G:g:T:U:O:l:n:i:o:a:t:D:A:R:P:B:e:Q:X:I:w:", case 'N': setval ("timestamping", "on"); break; + case 'p': + setval ("pagerequisites", "on"); + break; case 'S': setval ("serverresponse", "on"); break; @@ -408,12 +472,13 @@ hVqvdkKsxmNWrHSLcFbEY:G:g:T:U:O:l:n:i:o:a:t:D:A:R:P:B:e:Q:X:I:w:", case 'V': printf ("GNU Wget %s\n\n", version_string); printf ("%s", _("\ -Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.\n\ +Copyright (C) 1995, 1996, 1997, 1998, 2000, 2001 Free Software Foundation, Inc.\n")); + printf ("%s", _("\ This program is distributed in the hope that it will be useful,\n\ but WITHOUT ANY WARRANTY; without even the implied warranty of\n\ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n\ GNU General Public License for more details.\n")); - printf (_("\nWritten by Hrvoje Niksic .\n")); + printf (_("\nOriginally written by Hrvoje Niksic .\n")); exit (0); break; case 'v': @@ -424,43 +489,59 @@ GNU General Public License for more details.\n")); break; /* Options accepting an argument: */ - case 1: + case 129: setval ("httpuser", optarg); break; - case 2: + case 130: setval ("httppasswd", optarg); break; - case 3: + case 131: setval ("header", optarg); break; - case 6: + case 134: setval ("dotstyle", optarg); break; - case 7: + case 135: setval ("htmlify", optarg); break; - case 12: + case 140: setval ("excludedomains", optarg); break; - case 15: + case 143: setval ("proxyuser", optarg); break; - case 16: + case 144: setval ("proxypasswd", optarg); break; - case 23: + case 151: setval ("backups", optarg); break; - case 24: + case 152: setval ("waitretry", optarg); - wr = 1; break; - case 25: + case 153: setval ("followtags", optarg); break; - case 129: + case 160: + setval ("cookies", optarg); + break; + case 161: + setval ("loadcookies", optarg); + break; + case 162: + setval ("savecookies", optarg); + break; + case 157: setval ("referer", optarg); break; +#ifdef HAVE_SSL + case 158: + setval ("sslcertfile", optarg); + break; + case 159: + setval ("sslcertkey", optarg); + break; +#endif /* HAVE_SSL */ case 'A': setval ("accept", optarg); break; @@ -491,8 +572,8 @@ GNU General Public License for more details.\n")); optarg); exit (1); } - free (com); - free (val); + xfree (com); + xfree (val); } break; case 'G': @@ -539,6 +620,9 @@ GNU General Public License for more details.\n")); case 'p': setval ("noparent", "on"); break; + case 'k': + setval ("httpkeepalive", "off"); + break; default: printf (_("%s: illegal option -- `-n%c'\n"), exec_name, *p); print_usage (); @@ -590,21 +674,24 @@ GNU General Public License for more details.\n")); break; } } - if (opt.verbose == -1) - opt.verbose = !opt.quiet; - /* Retain compatibility with previous scripts. - if wait has been set, but waitretry has not, give it the wait value. - A simple check on the values is not enough, I could have set - wait to n>0 and waitretry to 0 - HEH */ - if (opt.wait && !wr) - { - char opt_wait_str[256]; /* bigger than needed buf to prevent overflow */ + /* All user options have now been processed, so it's now safe to do + interoption dependency checks. */ + + if (opt.reclevel == 0) + opt.reclevel = INFINITE_RECURSION; /* see wget.h for commentary on this */ - sprintf(opt_wait_str, "%ld", opt.wait); - setval ("waitretry", opt_wait_str); + if (opt.page_requisites && !opt.recursive) + { + opt.recursive = TRUE; + opt.reclevel = 0; + if (!opt.no_dirstruct) + opt.dirstruct = TRUE; /* usually handled by cmd_spec_recursive() */ } - + + if (opt.verbose == -1) + opt.verbose = !opt.quiet; + /* Sanity checks. */ if (opt.verbose && opt.quiet) { @@ -640,9 +727,14 @@ Can't timestamp and not clobber old files at the same time.\n")); /* Fill in the arguments. */ for (i = 0; i < nurl; i++, optind++) { - char *irix4_cc_needs_this; - STRDUP_ALLOCA (irix4_cc_needs_this, argv[optind]); - url[i] = irix4_cc_needs_this; + char *rewritten = rewrite_shorthand_url (argv[optind]); + if (rewritten) + { + printf ("Converted %s to %s\n", argv[optind], rewritten); + url[i] = rewritten; + } + else + url[i] = xstrdup (argv[optind]); } url[i] = NULL; @@ -657,6 +749,7 @@ Can't timestamp and not clobber old files at the same time.\n")); DEBUGP (("DEBUG output created by Wget %s on %s.\n\n", version_string, OS_TYPE)); + /* Open the output filename if necessary. */ if (opt.output_document) { @@ -664,12 +757,15 @@ Can't timestamp and not clobber old files at the same time.\n")); opt.dfp = stdout; else { - opt.dfp = fopen (opt.output_document, "wb"); + struct stat st; + opt.dfp = fopen (opt.output_document, opt.always_rest ? "ab" : "wb"); if (opt.dfp == NULL) { perror (opt.output_document); exit (1); } + if (fstat (fileno (opt.dfp), &st) == 0 && S_ISREG (st.st_mode)) + opt.od_known_regular = 1; } } @@ -695,13 +791,23 @@ Can't timestamp and not clobber old files at the same time.\n")); /* Retrieve the URLs from argument list. */ for (t = url; *t; t++) { - char *filename, *new_file; + char *filename, *redirected_URL; int dt; - status = retrieve_url (*t, &filename, &new_file, NULL, &dt); + status = retrieve_url (*t, &filename, &redirected_URL, NULL, &dt); if (opt.recursive && status == RETROK && (dt & TEXTHTML)) - status = recursive_retrieve (filename, new_file ? new_file : *t); - FREE_MAYBE (new_file); + status = recursive_retrieve (filename, + redirected_URL ? redirected_URL : *t); + + if (opt.delete_after && file_exists_p(filename)) + { + DEBUGP (("Removing file due to --delete-after in main():\n")); + logprintf (LOG_VERBOSE, _("Removing %s.\n"), filename); + if (unlink (filename)) + logprintf (LOG_NOTQUIET, "unlink: %s\n", strerror (errno)); + } + + FREE_MAYBE (redirected_URL); FREE_MAYBE (filename); } @@ -721,19 +827,33 @@ Can't timestamp and not clobber old files at the same time.\n")); { logprintf (LOG_NOTQUIET, _("\nFINISHED --%s--\nDownloaded: %s bytes in %d files\n"), - time_str (NULL), legible (opt.downloaded), opt.numurls); + time_str (NULL), + (opt.downloaded_overflow ? + "" : legible_very_long (opt.downloaded)), + opt.numurls); /* Print quota warning, if exceeded. */ - if (opt.quota && opt.downloaded > opt.quota) + if (downloaded_exceeds_quota ()) logprintf (LOG_NOTQUIET, _("Download quota (%s bytes) EXCEEDED!\n"), legible (opt.quota)); } - if (opt.convert_links) + + if (opt.cookies_output) + save_cookies (opt.cookies_output); + + if (opt.convert_links && !opt.delete_after) { convert_all_links (); } + log_close (); + for (i = 0; i < nurl; i++) + xfree (url[i]); cleanup (); + +#ifdef DEBUG_MALLOC + print_malloc_debug_stats (); +#endif if (status == RETROK) return 0; else