X-Git-Url: http://sjero.net/git/?p=wget;a=blobdiff_plain;f=src%2Fmain.c;h=cfcdbbe3ad52f9e72fefbbaa31fb4505231d62a7;hp=6a79e0b07e2c2ed0105d31648789e64fe5517c44;hb=30ac043b0a4a9a983dd1b50ce1c89ed953019292;hpb=ee99e8998a0fb3b4c891ac011c66d1b17e906c14 diff --git a/src/main.c b/src/main.c index 6a79e0b0..cfcdbbe3 100644 --- a/src/main.c +++ b/src/main.c @@ -1,5 +1,5 @@ /* Command line parsing. - Copyright (C) 1995, 1996, 1997, 1998, 2000, 2001 + Copyright (C) 1995, 1996, 1997, 1998, 2000, 2001, 2002 Free Software Foundation, Inc. This file is part of GNU Wget. @@ -16,7 +16,17 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with Wget; if not, write to the Free Software -Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +In addition, as a special exception, the Free Software Foundation +gives permission to link the code of its release of Wget with the +OpenSSL project's "OpenSSL" library (or with modified versions of it +that use the same license as the "OpenSSL" library), and distribute +the linked executables. You must obey the GNU General Public License +in all respects for all of the code used other than "OpenSSL". If you +modify this file, you may extend this exception to your version of the +file, but you are not obligated to do so. If you do not wish to do +so, delete this exception statement from your version. */ #include @@ -41,8 +51,6 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #endif /* HAVE_NLS */ #include -#define OPTIONS_DEFINED_HERE /* for options.h */ - #include "wget.h" #include "utils.h" #include "init.h" @@ -50,6 +58,12 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #include "recur.h" #include "host.h" #include "cookies.h" +#include "url.h" +#include "progress.h" /* for progress_handle_sigwinch */ + +#ifdef HAVE_SSL +# include "gen_sslfunc.h" +#endif /* On GNU system this will include system-wide getopt.h. */ #include "getopt.h" @@ -66,10 +80,12 @@ extern int errno; struct options opt; +extern struct cookie_jar *wget_cookie_jar; + /* From log.c. */ void log_init PARAMS ((const char *, int)); void log_close PARAMS ((void)); -void redirect_output PARAMS ((const char *)); +void log_request_redirect_output PARAMS ((const char *)); static RETSIGTYPE redirect_output_signal PARAMS ((int)); @@ -102,18 +118,6 @@ i18n_initialize (void) 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 @@ -154,25 +158,26 @@ Logging and input file:\n\ -i, --input-file=FILE download URLs found in FILE.\n\ -F, --force-html treat input file as HTML.\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); +\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\ + --retry-connrefused retry even if connection is refused.\n\ -O --output-document=FILE write documents to 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\ + --progress=TYPE select progress gauge type.\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 1...SECONDS between retries of a retrieval.\n\ + --random-wait wait from 0...2*WAIT secs between retrievals.\n\ -Y, --proxy=on/off turn proxy on or off.\n\ -Q, --quota=NUMBER set retrieval quota to NUMBER.\n\ + --bind-address=ADDRESS bind to ADDRESS (hostname or IP) on local host.\n\ + --limit-rate=RATE limit download rate to RATE.\n\ \n"), stdout); fputs (_("\ Directories:\n\ @@ -199,7 +204,23 @@ HTTP options:\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\ + --post-data=STRING use the POST method; send STRING as the data.\n\ + --post-file=FILE use the POST method; send contents of FILE.\n\ \n"), stdout); +#ifdef HAVE_SSL + fputs (_("\ +HTTPS (SSL) options:\n\ + --sslcertfile=FILE optional client certificate.\n\ + --sslcertkey=KEYFILE optional keyfile for this certificate.\n\ + --egd-file=FILE file name of the EGD socket.\n\ + --sslcadir=DIR dir where hash list of CA's are stured.\n\ + --sslcafile=FILE file with bundle of CA's\n\ + --sslcerttype=0/1 Client-Cert type 0=PEM (default) / 1=ASN1 (DER)\n\ + --sslcheckcert=0/1 Check the server cert agenst given CA\n\ + --sslprotocol=0-3 choose SSL protocol; 0=automatic,\n\ + 1=SSLv2 2=SSLv3 3=TLSv1\n\ +\n"), stdout); +#endif fputs (_("\ FTP options:\n\ -nr, --dont-remove-listing don\'t remove `.listing\' files.\n\ @@ -209,7 +230,7 @@ FTP options:\n\ \n"), stdout); fputs (_("\ Recursive retrieval:\n\ - -r, --recursive recursive web-suck -- use with care!\n\ + -r, --recursive recursive download.\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\ @@ -230,7 +251,6 @@ Recursive accept/reject:\n\ -L, --relative follow relative links only.\n\ -I, --include-directories=LIST list of allowed directories.\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"), stdout); fputs (_("Mail bug reports and suggestions to .\n"), @@ -242,7 +262,6 @@ 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[] = { @@ -272,9 +291,11 @@ main (int argc, char *const *argv) { "passive-ftp", no_argument, NULL, 139 }, { "page-requisites", no_argument, NULL, 'p' }, { "quiet", no_argument, NULL, 'q' }, + { "random-wait", no_argument, NULL, 165 }, { "recursive", no_argument, NULL, 'r' }, { "relative", no_argument, NULL, 'L' }, { "retr-symlinks", no_argument, NULL, 137 }, + { "retry-connrefused", no_argument, NULL, 174 }, { "save-headers", no_argument, NULL, 's' }, { "server-response", no_argument, NULL, 'S' }, { "span-hosts", no_argument, NULL, 'H' }, @@ -308,10 +329,14 @@ main (int argc, char *const *argv) { "include-directories", required_argument, NULL, 'I' }, { "input-file", required_argument, NULL, 'i' }, { "level", required_argument, NULL, 'l' }, + { "limit-rate", required_argument, NULL, 164 }, { "load-cookies", required_argument, NULL, 161 }, { "no", required_argument, NULL, 'n' }, { "output-document", required_argument, NULL, 'O' }, { "output-file", required_argument, NULL, 'o' }, + { "post-data", required_argument, NULL, 167 }, + { "post-file", required_argument, NULL, 168 }, + { "progress", required_argument, NULL, 163 }, { "proxy", required_argument, NULL, 'Y' }, { "proxy-passwd", required_argument, NULL, 144 }, { "proxy-user", required_argument, NULL, 143 }, @@ -326,6 +351,12 @@ main (int argc, char *const *argv) #ifdef HAVE_SSL { "sslcertfile", required_argument, NULL, 158 }, { "sslcertkey", required_argument, NULL, 159 }, + { "egd-file", required_argument, NULL, 166 }, + { "sslcadir", required_argument, NULL, 169}, + { "sslcafile", required_argument, NULL, 170}, + { "sslcerttype", required_argument, NULL, 171}, + { "sslcheckcert", required_argument, NULL, 172}, + { "sslprotocol", required_argument, NULL, 173}, #endif /* HAVE_SSL */ { "wait", required_argument, NULL, 'w' }, { "waitretry", required_argument, NULL, 152 }, @@ -333,7 +364,6 @@ main (int argc, char *const *argv) }; i18n_initialize (); - private_initialize (); append_to_log = 0; @@ -400,15 +430,15 @@ hpVqvdkKsxmNWrHSLcFbEY:G:g:T:U:O:l:n:i:o:a:t:D:A:R:P:B:e:Q:X:I:w:C:", case 149: setval ("removelisting", "off"); break; - case 150: - setval ("simplehostcheck", "on"); - break; case 155: setval ("bindaddress", optarg); break; case 156: setval ("httpkeepalive", "off"); break; + case 165: + setval ("randomwait", "on"); + break; case 'b': setval ("background", "on"); break; @@ -472,7 +502,8 @@ hpVqvdkKsxmNWrHSLcFbEY:G:g:T:U:O:l:n:i:o:a:t:D:A:R:P:B:e:Q:X:I:w:C:", case 'V': printf ("GNU Wget %s\n\n", version_string); printf ("%s", _("\ -Copyright (C) 1995, 1996, 1997, 1998, 2000, 2001 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\ @@ -486,6 +517,9 @@ GNU General Public License for more details.\n")); case 'x': setval ("dirstruct", "on"); break; + case 174: + setval ("retryconnrefused", "on"); + break; /* Options accepting an argument: */ case 129: @@ -517,7 +551,6 @@ GNU General Public License for more details.\n")); break; case 152: setval ("waitretry", optarg); - wr = 1; break; case 153: setval ("followtags", optarg); @@ -531,6 +564,12 @@ GNU General Public License for more details.\n")); case 162: setval ("savecookies", optarg); break; + case 163: + setval ("progress", optarg); + break; + case 164: + setval ("limitrate", optarg); + break; case 157: setval ("referer", optarg); break; @@ -541,7 +580,31 @@ GNU General Public License for more details.\n")); case 159: setval ("sslcertkey", optarg); break; + case 166: + setval ("egdfile", optarg); + break; + case 169: + setval ("sslcadir", optarg); + break; + case 170: + setval ("sslcafile", optarg); + break; + case 171: + setval ("sslcerttype", optarg); + break; + case 172: + setval ("sslcheckcert", optarg); + break; + case 173: + setval ("sslprotocol", optarg); + break; #endif /* HAVE_SSL */ + case 167: + setval ("postdata", optarg); + break; + case 168: + setval ("postfile", optarg); + break; case 'A': setval ("accept", optarg); break; @@ -593,7 +656,7 @@ GNU General Public License for more details.\n")); break; case 'n': { - /* #### The n? options are utter crock! */ + /* #### What we really want here is --no-foo. */ char *p; for (p = optarg; *p; p++) @@ -602,9 +665,6 @@ GNU General Public License for more details.\n")); case 'v': setval ("verbose", "off"); break; - case 'h': - setval ("simplehostcheck", "on"); - break; case 'H': setval ("addhostdir", "off"); break; @@ -692,18 +752,6 @@ GNU General Public License for more details.\n")); 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 */ - - sprintf(opt_wait_str, "%ld", opt.wait); - setval ("waitretry", opt_wait_str); - } - /* Sanity checks. */ if (opt.verbose && opt.quiet) { @@ -734,14 +782,21 @@ Can't timestamp and not clobber old files at the same time.\n")); if (opt.background) fork_to_background (); + /* Initialize progress. Have to do this after the options are + processed so we know where the log file is. */ + if (opt.verbose) + set_progress_implementation (opt.progress_type); + /* Allocate basic pointer. */ url = ALLOCA_ARRAY (char *, nurl + 1); /* 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) + url[i] = rewritten; + else + url[i] = xstrdup (argv[optind]); } url[i] = NULL; @@ -791,20 +846,28 @@ Can't timestamp and not clobber old files at the same time.\n")); process exits. What we want is to ignore SIGPIPE and just check for the return value of write(). */ signal (SIGPIPE, SIG_IGN); +#ifdef SIGWINCH + signal (SIGWINCH, progress_handle_sigwinch); +#endif #endif /* HAVE_SIGNAL */ +#ifdef HAVE_SSL + /* Must call this before resolving any URLs because it has the power + to disable `https'. */ + ssl_init_prng (); +#endif + status = RETROK; /* initialize it, just-in-case */ - recursive_reset (); /* Retrieve the URLs from argument list. */ for (t = url; *t; t++) { - char *filename, *redirected_URL; + char *filename = NULL, *redirected_URL = NULL; int dt; - status = retrieve_url (*t, &filename, &redirected_URL, NULL, &dt); - if (opt.recursive && status == RETROK && (dt & TEXTHTML)) - status = recursive_retrieve (filename, - redirected_URL ? redirected_URL : *t); + if (opt.recursive && url_scheme (*t) != SCHEME_FTP) + status = retrieve_tree (*t); + else + status = retrieve_url (*t, &filename, &redirected_URL, NULL, &dt); if (opt.delete_after && file_exists_p(filename)) { @@ -845,15 +908,19 @@ Can't timestamp and not clobber old files at the same time.\n")); legible (opt.quota)); } - if (opt.cookies_output) - save_cookies (opt.cookies_output); + if (opt.cookies_output && wget_cookie_jar) + cookie_jar_save (wget_cookie_jar, 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 @@ -863,22 +930,23 @@ Can't timestamp and not clobber old files at the same time.\n")); return 1; } +#ifdef HAVE_SIGNAL /* Hangup signal handler. When wget receives SIGHUP or SIGUSR1, it will proceed operation as usual, trying to write into a log file. - If that is impossible, the output will be turned off. */ + If that is impossible, the output will be turned off. + + #### It is unsafe to do call libc functions from a signal handler. + What we should do is, set a global variable, and have the code in + log.c pick it up. */ -#ifdef HAVE_SIGNAL static RETSIGTYPE redirect_output_signal (int sig) { - char tmp[100]; + char *signal_name = (sig == SIGHUP ? "SIGHUP" : + (sig == SIGUSR1 ? "SIGUSR1" : + "WTF?!")); + log_request_redirect_output (signal_name); + progress_schedule_redirect (); signal (sig, redirect_output_signal); - /* Please note that the double `%' in `%%s' is intentional, because - redirect_output passes tmp through printf. */ - sprintf (tmp, _("%s received, redirecting output to `%%s'.\n"), - (sig == SIGHUP ? "SIGHUP" : - (sig == SIGUSR1 ? "SIGUSR1" : - "WTF?!"))); - redirect_output (tmp); } #endif /* HAVE_SIGNAL */