X-Git-Url: http://sjero.net/git/?a=blobdiff_plain;f=src%2Finit.c;h=e342b848ccb8bdfd207888f0cbaffde5294d48f2;hb=30ac043b0a4a9a983dd1b50ce1c89ed953019292;hp=20bbc6a29ccb06f8de6e00210ecdc508eec7daab;hpb=cb4003403509b46d2f6ef6936baf969906ff1430;p=wget diff --git a/src/init.c b/src/init.c index 20bbc6a2..e342b848 100644 --- a/src/init.c +++ b/src/init.c @@ -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 @@ -53,13 +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. */ @@ -70,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); @@ -108,7 +119,7 @@ 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 }, + { "bindaddress", &opt.bind_address, cmd_string }, { "cache", &opt.allow_cache, cmd_boolean }, { "continue", &opt.always_rest, cmd_boolean }, { "convertlinks", &opt.convert_links, cmd_boolean }, @@ -125,6 +136,9 @@ static struct { { "dotsinline", &opt.dots_in_line, cmd_number }, { "dotspacing", &opt.dot_spacing, cmd_number }, { "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 }, @@ -159,6 +173,8 @@ 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 }, @@ -172,6 +188,7 @@ 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 }, @@ -179,9 +196,13 @@ static struct { { "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 }, - { "egdfile", &opt.sslegdsock, 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 }, @@ -193,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; } @@ -513,45 +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 address_list *al; - wget_sockaddr sa; - wget_sockaddr **target = (wget_sockaddr **)closure; - - memset (&sa, '\0', sizeof (sa)); - - 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; - } - sa.sa.sa_family = ip_default_family; - wget_sockaddr_set_port (&sa, 0); - address_list_copy_one (al, 0, wget_sockaddr_get_addr (&sa)); - address_list_release (al); - - FREE_MAYBE (*target); - - *target = xmalloc (sizeof (sa)); - memcpy (*target, &sa, sizeof (sa)); - - return 1; -} - /* Store the boolean value from VAL to CLOSURE. COM is ignored, except for error messages. */ static int @@ -708,7 +690,7 @@ cmd_file (const char *com, const char *val, void *closure) ; #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); @@ -1093,8 +1075,8 @@ cleanup (void) http_cleanup (); cleanup_html_url (); downloaded_files_free (); - cookies_cleanup (); host_cleanup (); + cookie_jar_delete (wget_cookie_jar); { extern acc_t *netrc_list;