[svn] Allow --foo=yes/no in addition to --foo=on/off.

[wget] / src / init.c

diff --git a/src/init.c b/src/init.c
index 65975d4e486ad6506682e1860b2d91d0d369b89a..124bfb10926b59eaca1829c71d084fffb69296dd 100644 (file)
--- 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 <config.h>
 
@@ -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.  */
@@ -119,6 +131,7 @@ static struct {
   { "deleteafter",     &opt.delete_after,      cmd_boolean },
   { "dirprefix",       &opt.dir_prefix,        cmd_directory },
   { "dirstruct",       NULL,                   cmd_spec_dirstruct },
+  { "dnscache",                &opt.dns_cache,         cmd_boolean },
   { "domains",         &opt.domains,           cmd_vector },
   { "dotbytes",                &opt.dot_bytes,         cmd_bytes },
   { "dotsinline",      &opt.dots_in_line,      cmd_number },
@@ -176,6 +189,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 },
@@ -183,8 +197,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 },
+  { "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 },
@@ -260,6 +279,8 @@ defaults (void)
   opt.dot_bytes = 1024;
   opt.dot_spacing = 10;
   opt.dots_in_line = 50;
+
+  opt.dns_cache = 1;
 }
 \f
 /* Return the user's home directory (strdup-ed), or NULL if none is
@@ -522,12 +543,22 @@ static int
 cmd_boolean (const char *com, const char *val, void *closure)
 {
   int bool_value;
-
-  if (!strcasecmp (val, "on")
-      || (*val == '1' && !*(val + 1)))
+  const char *v = val;
+#define LC(x) TOLOWER(x)
+
+  if ((LC(v[0]) == 'o' && LC(v[1]) == 'n' && !v[2])
+      ||
+      (LC(v[0]) == 'y' && LC(v[1]) == 'e' && LC(v[2]) == 's' && !v[3])
+      ||
+      (v[0] == '1' && !v[1]))
+    /* "on", "yes" and "1" mean true. */
     bool_value = 1;
-  else if (!strcasecmp (val, "off")
-          || (*val == '0' && !*(val + 1)))
+  else if ((LC(v[0]) == 'o' && LC(v[1]) == 'f' && LC(v[2]) == 'f' && !v[3])
+          ||
+          (LC(v[0]) == 'n' && LC(v[1]) == 'o' && !v[2])
+          ||
+          (v[0] == '0' && !v[1]))
+    /* "off", "no" and "0" mean false. */
     bool_value = 0;
   else
     {
@@ -561,17 +592,17 @@ cmd_lockable_boolean (const char *com, const char *val, void *closure)
   if (*(int *)closure == -1 || *(int *)closure == 2)
     return 1;
 
-  if (!strcasecmp (val, "always")
-      || (*val == '2' && !*(val + 1)))
+  if (!strcasecmp (val, "always") || !strcmp (val, "2"))
     lockable_boolean_value = 2;
   else if (!strcasecmp (val, "on")
-      || (*val == '1' && !*(val + 1)))
+          || !strcasecmp (val, "yes")
+          || !strcmp (val, "1"))
     lockable_boolean_value = 1;
   else if (!strcasecmp (val, "off")
-          || (*val == '0' && !*(val + 1)))
+          || !strcasecmp (val, "no")
+          || !strcmp (val, "0"))
     lockable_boolean_value = 0;
-  else if (!strcasecmp (val, "never")
-      || (*val == '-' && *(val + 1) == '1' && !*(val + 2)))
+  else if (!strcasecmp (val, "never") || !strcmp (val, "-1"))
     lockable_boolean_value = -1;
   else
     {
@@ -672,7 +703,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);
@@ -1057,8 +1088,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;