X-Git-Url: http://sjero.net/git/?a=blobdiff_plain;f=src%2Finit.c;h=e342b848ccb8bdfd207888f0cbaffde5294d48f2;hb=30ac043b0a4a9a983dd1b50ce1c89ed953019292;hp=46fd6b910621be0532e6181d38eec567c0dafe61;hpb=8a0e9e765e42b9ab4fbab5a145a19f1069242858;p=wget diff --git a/src/init.c b/src/init.c index 46fd6b91..e342b848 100644 --- a/src/init.c +++ b/src/init.c @@ -1,21 +1,32 @@ /* Reading/parsing the initialization file. - Copyright (C) 1995, 1996, 1997, 1998, 2000 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 -Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +along with Wget; if not, write to the Free Software +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 @@ -37,8 +48,10 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #else # include # include +#ifndef __BEOS__ # include #endif +#endif #ifdef HAVE_PWD_H #include @@ -50,12 +63,15 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #include "host.h" #include "recur.h" #include "netrc.h" -#include "cookies.h" /* for cookies_cleanup */ +#include "cookies.h" /* for cookie_jar_delete */ +#include "progress.h" #ifndef errno extern int errno; #endif +extern struct cookie_jar *wget_cookie_jar; + /* We want tilde expansion enabled only when reading `.wgetrc' lines; otherwise, it will be performed by the shell. This variable will be set by the wgetrc-reading function. */ @@ -66,7 +82,6 @@ static int enable_tilde_expansion; #define CMD_DECLARE(func) static int func \ PARAMS ((const char *, const char *, void *)) -CMD_DECLARE (cmd_address); CMD_DECLARE (cmd_boolean); CMD_DECLARE (cmd_bytes); CMD_DECLARE (cmd_directory_vector); @@ -75,14 +90,15 @@ CMD_DECLARE (cmd_number); CMD_DECLARE (cmd_number_inf); CMD_DECLARE (cmd_string); CMD_DECLARE (cmd_file); +CMD_DECLARE (cmd_directory); CMD_DECLARE (cmd_time); CMD_DECLARE (cmd_vector); CMD_DECLARE (cmd_spec_dirstruct); -CMD_DECLARE (cmd_spec_dotstyle); CMD_DECLARE (cmd_spec_header); CMD_DECLARE (cmd_spec_htmlify); CMD_DECLARE (cmd_spec_mirror); +CMD_DECLARE (cmd_spec_progress); CMD_DECLARE (cmd_spec_recursive); CMD_DECLARE (cmd_spec_useragent); @@ -103,8 +119,8 @@ static struct { { "backupconverted", &opt.backup_converted, cmd_boolean }, { "backups", &opt.backups, cmd_number }, { "base", &opt.base_href, cmd_string }, - { "bindaddress", &opt.bind_address, cmd_address }, - { "cache", &opt.proxy_cache, cmd_boolean }, + { "bindaddress", &opt.bind_address, cmd_string }, + { "cache", &opt.allow_cache, cmd_boolean }, { "continue", &opt.always_rest, cmd_boolean }, { "convertlinks", &opt.convert_links, cmd_boolean }, { "cookies", &opt.cookies, cmd_boolean }, @@ -113,13 +129,16 @@ static struct { { "debug", &opt.debug, cmd_boolean }, #endif { "deleteafter", &opt.delete_after, cmd_boolean }, - { "dirprefix", &opt.dir_prefix, cmd_file }, + { "dirprefix", &opt.dir_prefix, cmd_directory }, { "dirstruct", NULL, cmd_spec_dirstruct }, { "domains", &opt.domains, cmd_vector }, { "dotbytes", &opt.dot_bytes, cmd_bytes }, { "dotsinline", &opt.dots_in_line, cmd_number }, { "dotspacing", &opt.dot_spacing, cmd_number }, - { "dotstyle", NULL, cmd_spec_dotstyle }, + { "dotstyle", &opt.dot_style, cmd_string }, +#ifdef HAVE_SSL + { "egdfile", &opt.sslegdsock, cmd_file }, +#endif { "excludedirectories", &opt.excludes, cmd_directory_vector }, { "excludedomains", &opt.exclude_domains, cmd_vector }, { "followftp", &opt.follow_ftp, cmd_boolean }, @@ -140,6 +159,7 @@ static struct { { "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 }, @@ -153,10 +173,14 @@ static struct { { "pagerequisites", &opt.page_requisites, cmd_boolean }, { "passiveftp", &opt.ftp_pasv, cmd_lockable_boolean }, { "passwd", &opt.ftp_pass, cmd_string }, + { "postdata", &opt.post_data, cmd_string }, + { "postfile", &opt.post_file_name, cmd_file }, + { "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 }, @@ -164,16 +188,21 @@ static struct { { "relativeonly", &opt.relative_only, cmd_boolean }, { "removelisting", &opt.remove_listing, cmd_boolean }, { "retrsymlinks", &opt.retr_symlinks, cmd_boolean }, + { "retryconnrefused", &opt.retry_connrefused, cmd_boolean }, { "robots", &opt.use_robots, cmd_boolean }, { "savecookies", &opt.cookies_output, cmd_file }, { "saveheaders", &opt.save_headers, cmd_boolean }, { "serverresponse", &opt.server_response, cmd_boolean }, - { "simplehostcheck", &opt.simple_check, cmd_boolean }, { "spanhosts", &opt.spanhost, cmd_boolean }, { "spider", &opt.spider, cmd_boolean }, #ifdef HAVE_SSL + { "sslcadir", &opt.sslcadir, cmd_directory }, + { "sslcafile", &opt.sslcafile, cmd_file }, { "sslcertfile", &opt.sslcertfile, cmd_file }, { "sslcertkey", &opt.sslcertkey, cmd_file }, + { "sslcerttype", &opt.sslcerttype, cmd_number }, + { "sslcheckcert", &opt.sslcheckcert, cmd_number }, + { "sslprotocol", &opt.sslprotocol, cmd_number }, #endif /* HAVE_SSL */ { "timeout", &opt.timeout, cmd_time }, { "timestamping", &opt.timestamping, cmd_boolean }, @@ -185,25 +214,25 @@ static struct { { "waitretry", &opt.waitretry, cmd_time } }; -/* Return index of COM if it is a valid command, or -1 otherwise. COM - is looked up in `commands' using binary search algorithm. */ +/* Look up COM in the commands[] array and return its index. If COM + is not found, -1 is returned. This function uses binary search. */ + static int comind (const char *com) { - int min = 0, max = ARRAY_SIZE (commands) - 1; + int lo = 0, hi = ARRAY_SIZE (commands) - 1; - do + while (lo <= hi) { - int i = (min + max) / 2; - int cmp = strcasecmp (com, commands[i].name); - if (cmp == 0) - return i; - else if (cmp < 0) - max = i - 1; + int mid = (lo + hi) >> 1; + int cmp = strcasecmp (com, commands[mid].name); + if (cmp < 0) + hi = mid - 1; + else if (cmp > 0) + lo = mid + 1; else - min = i + 1; + return mid; } - while (min <= max); return -1; } @@ -227,8 +256,8 @@ defaults (void) opt.ntry = 20; opt.reclevel = 5; opt.add_hostdir = 1; - opt.ftp_acc = xstrdup ("anonymous"); - /*opt.ftp_pass = xstrdup (ftp_getaddress ());*/ + opt.ftp_acc = xstrdup ("anonymous"); + opt.ftp_pass = xstrdup ("-wget@"); opt.netrc = 1; opt.ftp_glob = 1; opt.htmlify = 1; @@ -237,7 +266,7 @@ defaults (void) tmp = getenv ("no_proxy"); if (tmp) opt.no_proxy = sepstring (tmp); - opt.proxy_cache = 1; + opt.allow_cache = 1; #ifdef HAVE_SELECT opt.timeout = 900; @@ -294,7 +323,7 @@ wgetrc_file_name (void) { 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); @@ -505,40 +534,6 @@ setval (const char *com, const char *val) static int myatoi PARAMS ((const char *s)); -/* Interpret VAL as an Internet address (a hostname or a dotted-quad - IP address), and write it (in network order) to a malloc-allocated - address. That address gets stored to the memory pointed to by - CLOSURE. COM is ignored, except for error messages. - - #### IMHO it's a mistake to do this kind of work so early in the - process (before any download even started!) opt.bind_address - should simply remember the provided value as a string. Another - function should do the lookup, when needed, and cache the - result. --hniksic */ -static int -cmd_address (const char *com, const char *val, void *closure) -{ - struct sockaddr_in sin; - struct sockaddr_in **target = (struct sockaddr_in **)closure; - - if (!store_hostaddress ((unsigned char *)&sin.sin_addr, val)) - { - fprintf (stderr, _("%s: %s: Cannot convert `%s' to an IP address.\n"), - exec_name, com, val); - return 0; - } - - sin.sin_family = AF_INET; - sin.sin_port = 0; - - FREE_MAYBE (*target); - - *target = xmalloc (sizeof (sin)); - memcpy (*target, &sin, sizeof (sin)); - - return 1; -} - /* Store the boolean value from VAL to CLOSURE. COM is ignored, except for error messages. */ static int @@ -658,7 +653,14 @@ cmd_file (const char *com, const char *val, void *closure) char **pstring = (char **)closure; FREE_MAYBE (*pstring); - if (!enable_tilde_expansion || !(*val == '~' && *(val + 1) == '/')) + + /* #### If VAL is empty, perhaps should set *CLOSURE to NULL. */ + + if (!enable_tilde_expansion || !(*val == '~' && (*(val + 1) == '/' +#ifdef WINDOWS + || *(val + 1) == '\\' +#endif + ))) { noexpand: *pstring = xstrdup (val); @@ -672,20 +674,58 @@ cmd_file (const char *com, const char *val, void *closure) goto noexpand; homelen = strlen (home); - while (homelen && home[homelen - 1] == '/') + while (homelen && (home[homelen - 1] == '/' +#ifdef WINDOWS + || home[homelen - 1] == '\\' +#endif + )) home[--homelen] = '\0'; /* Skip the leading "~/". */ +#ifdef WINDOWS + for (++val; *val == '/' || *val == '\\'; val++) + ; +#else for (++val; *val == '/'; val++) ; +#endif - result = xmalloc (homelen + 1 + strlen (val)); + result = xmalloc (homelen + 1 + strlen (val) + 1); memcpy (result, home, homelen); result[homelen] = '/'; strcpy (result + homelen + 1, val); *pstring = result; } +#ifdef WINDOWS + /* Convert "\" to "/". */ + { + char *s; + for (s = *pstring; *s; s++) + if (*s == '\\') + *s = '/'; + } +#endif + return 1; +} + +/* Like cmd_file, but strips trailing '/' characters. */ +static int +cmd_directory (const char *com, const char *val, void *closure) +{ + char *s, *t; + + /* Call cmd_file() for tilde expansion and separator + canonicalization (backslash -> slash under Windows). These + things should perhaps be in a separate function. */ + if (!cmd_file (com, val, closure)) + return 0; + + s = *(char **)closure; + t = s + strlen (s); + while (t > s && *--t == '/') + *t = '\0'; + return 1; } @@ -866,61 +906,6 @@ cmd_spec_dirstruct (const char *com, const char *val, void *closure) return 1; } -static int -cmd_spec_dotstyle (const char *com, const char *val, void *closure) -{ - /* Retrieval styles. */ - if (!strcasecmp (val, "default")) - { - /* Default style: 1K dots, 10 dots in a cluster, 50 dots in a - line. */ - opt.dot_bytes = 1024; - opt.dot_spacing = 10; - opt.dots_in_line = 50; - } - else if (!strcasecmp (val, "binary")) - { - /* "Binary" retrieval: 8K dots, 16 dots in a cluster, 48 dots - (384K) in a line. */ - opt.dot_bytes = 8192; - opt.dot_spacing = 16; - opt.dots_in_line = 48; - } - else if (!strcasecmp (val, "mega")) - { - /* "Mega" retrieval, for retrieving very long files; each dot is - 64K, 8 dots in a cluster, 6 clusters (3M) in a line. */ - opt.dot_bytes = 65536L; - opt.dot_spacing = 8; - opt.dots_in_line = 48; - } - else if (!strcasecmp (val, "giga")) - { - /* "Giga" retrieval, for retrieving very very *very* long files; - each dot is 1M, 8 dots in a cluster, 4 clusters (32M) in a - line. */ - opt.dot_bytes = (1L << 20); - opt.dot_spacing = 8; - opt.dots_in_line = 32; - } - else if (!strcasecmp (val, "micro")) - { - /* "Micro" retrieval, for retrieving very small files (and/or - slow connections); each dot is 128 bytes, 8 dots in a - cluster, 6 clusters (6K) in a line. */ - opt.dot_bytes = 128; - opt.dot_spacing = 8; - opt.dots_in_line = 48; - } - else - { - fprintf (stderr, _("%s: %s: Invalid specification `%s'.\n"), - exec_name, com, val); - return 0; - } - return 1; -} - static int cmd_spec_header (const char *com, const char *val, void *closure) { @@ -980,6 +965,23 @@ cmd_spec_mirror (const char *com, const char *val, void *closure) return 1; } +static int +cmd_spec_progress (const char *com, const char *val, void *closure) +{ + if (!valid_progress_implementation_p (val)) + { + fprintf (stderr, _("%s: %s: Invalid progress type `%s'.\n"), + exec_name, com, val); + return 0; + } + 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; +} + static int cmd_spec_recursive (const char *com, const char *val, void *closure) { @@ -1045,23 +1047,41 @@ check_user_specified_header (const char *s) } 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. */ void cleanup (void) { - extern acc_t *netrc_list; + /* Free external resources, close files, etc. */ - recursive_cleanup (); - clean_hosts (); - free_netrc (netrc_list); if (opt.dfp) fclose (opt.dfp); + + /* We're exiting anyway so there's no real need to call free() + hundreds of times. Skipping the frees will make Wget exit + faster. + + However, when detecting leaks, it's crucial to free() everything + because then you can find the real leaks, i.e. the allocated + memory which grows with the size of the program. */ + +#ifdef DEBUG_MALLOC + recursive_cleanup (); + res_cleanup (); + http_cleanup (); cleanup_html_url (); downloaded_files_free (); - cookies_cleanup (); + host_cleanup (); + cookie_jar_delete (wget_cookie_jar); + + { + extern acc_t *netrc_list; + free_netrc (netrc_list); + } FREE_MAYBE (opt.lfilename); xfree (opt.dir_prefix); FREE_MAYBE (opt.input_filename); @@ -1073,6 +1093,7 @@ cleanup (void) free_vec (opt.domains); free_vec (opt.follow_tags); free_vec (opt.ignore_tags); + FREE_MAYBE (opt.progress_type); xfree (opt.ftp_acc); FREE_MAYBE (opt.ftp_pass); FREE_MAYBE (opt.ftp_proxy); @@ -1091,4 +1112,5 @@ cleanup (void) FREE_MAYBE (opt.bind_address); FREE_MAYBE (opt.cookies_input); FREE_MAYBE (opt.cookies_output); +#endif }