[svn] Manually applied Rob Mayoff <mayoff@dqd.com>'s patch (vs. 1.5.3, not 1.5.3...

[wget] / src / init.c

diff --git a/src/init.c b/src/init.c
index 86ee46486c14b27280bb99f729f7da0a09cebb42..9e11944551dbd18cc2ead4e2175672627eccea9f 100644 (file)
--- a/src/init.c
+++ b/src/init.c
@@ -33,6 +33,14 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #endif
 #include <errno.h>
 
+#ifdef WINDOWS
+# include <winsock.h>
+#else
+# include <sys/socket.h>
+# include <netinet/in.h>
+# include <arpa/inet.h>
+#endif
+
 #ifdef HAVE_PWD_H
 #include <pwd.h>
 #endif
@@ -52,15 +60,16 @@ extern int errno;
 #define CMD_DECLARE(func) static int func \
   PARAMS ((const char *, const char *, void *))
 
+CMD_DECLARE (cmd_address);
 CMD_DECLARE (cmd_boolean);
-CMD_DECLARE (cmd_boolean);
+CMD_DECLARE (cmd_bytes);
+CMD_DECLARE (cmd_directory_vector);
+CMD_DECLARE (cmd_lockable_boolean);
 CMD_DECLARE (cmd_number);
 CMD_DECLARE (cmd_number_inf);
 CMD_DECLARE (cmd_string);
-CMD_DECLARE (cmd_vector);
-CMD_DECLARE (cmd_directory_vector);
-CMD_DECLARE (cmd_bytes);
 CMD_DECLARE (cmd_time);
+CMD_DECLARE (cmd_vector);
 
 CMD_DECLARE (cmd_spec_dirstruct);
 CMD_DECLARE (cmd_spec_dotstyle);
@@ -87,6 +96,7 @@ static struct {
   { "background",      &opt.background,        cmd_boolean },
   { "backupconverted", &opt.backup_converted,  cmd_boolean },
   { "backups",         &opt.backups,           cmd_number },
+  { "bindaddress",     &opt.bind_address,      cmd_address },
   { "base",            &opt.base_href,         cmd_string },
   { "cache",           &opt.proxy_cache,       cmd_boolean },
   { "continue",                &opt.always_rest,       cmd_boolean },
@@ -111,6 +121,7 @@ static struct {
   { "ftpproxy",                &opt.ftp_proxy,         cmd_string },
   { "glob",            &opt.ftp_glob,          cmd_boolean },
   { "header",          NULL,                   cmd_spec_header },
+  { "htmlextension",   &opt.html_extension,    cmd_boolean },
   { "htmlify",         NULL,                   cmd_spec_htmlify },
   { "httppasswd",      &opt.http_passwd,       cmd_string },
   { "httpproxy",       &opt.http_proxy,        cmd_string },
@@ -129,7 +140,8 @@ static struct {
   { "noproxy",         &opt.no_proxy,          cmd_vector },
   { "numtries",                &opt.ntry,              cmd_number_inf },/* deprecated*/
   { "outputdocument",  NULL,                   cmd_spec_outputdocument },
-  { "passiveftp",      &opt.ftp_pasv,          cmd_boolean },
+  { "pagerequisites",  &opt.page_requisites,   cmd_boolean },
+  { "passiveftp",      &opt.ftp_pasv,          cmd_lockable_boolean },
   { "passwd",          &opt.ftp_pass,          cmd_string },
   { "proxypasswd",     &opt.proxy_passwd,      cmd_string },
   { "proxyuser",       &opt.proxy_user,        cmd_string },
@@ -473,6 +485,35 @@ setval (const char *com, const char *val)
 
 static int myatoi PARAMS ((const char *s));
 
+/* Store the address (specified as hostname or dotted-quad IP address) from VAL
+   to CLOSURE.  COM is ignored, except for error messages.  */
+static int
+cmd_address (const char *com, const char *val, void *closure)
+{
+    struct sockaddr_in *sin;
+    
+    sin = (struct sockaddr_in *) malloc(sizeof *sin);
+    if (sin == NULL)
+    {
+       fprintf (stderr, _("%s: Out of memory.\n"), exec_name);
+       return 0;
+    }
+    
+    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;
+    
+    * (struct sockaddr_in **) closure = sin;
+    
+    return 1;
+}
+
 /* Store the boolean value from VAL to CLOSURE.  COM is ignored,
    except for error messages.  */
 static int
@@ -497,6 +538,51 @@ cmd_boolean (const char *com, const char *val, void *closure)
   return 1;
 }
 
+/* Store the lockable_boolean {2, 1, 0, -1} value from VAL to CLOSURE.  COM is
+   ignored, except for error messages.  Values 2 and -1 indicate that once
+   defined, the value may not be changed by successive wgetrc files or
+   command-line arguments.
+
+   Values: 2 - Enable a particular option for good ("always")
+           1 - Enable an option ("on")
+           0 - Disable an option ("off")
+          -1 - Disable an option for good ("never") */
+static int
+cmd_lockable_boolean (const char *com, const char *val, void *closure)
+{
+  int lockable_boolean_value;
+
+  /*
+   * If a config file said "always" or "never", don't allow command line
+   * arguments to override the config file.
+   */
+  if (*(int *)closure == -1 || *(int *)closure == 2)
+    return 1;
+
+  if (!strcasecmp (val, "always")
+      || (*val == '2' && !*(val + 1)))
+    lockable_boolean_value = 2;
+  else if (!strcasecmp (val, "on")
+      || (*val == '1' && !*(val + 1)))
+    lockable_boolean_value = 1;
+  else if (!strcasecmp (val, "off")
+          || (*val == '0' && !*(val + 1)))
+    lockable_boolean_value = 0;
+  else if (!strcasecmp (val, "never")
+      || (*val == '-' && *(val + 1) == '1' && !*(val + 2)))
+    lockable_boolean_value = -1;
+  else
+    {
+      fprintf (stderr, _("%s: %s: Please specify always, on, off, "
+                        "or never.\n"),
+              exec_name, com);
+      return 0;
+    }
+
+  *(int *)closure = lockable_boolean_value;
+  return 1;
+}
+
 /* Set the non-negative integer value from VAL to CLOSURE.  With
    incorrect specification, the number remains unchanged.  */
 static int
@@ -823,7 +909,7 @@ cmd_spec_mirror (const char *com, const char *val, void *closure)
       if (!opt.no_dirstruct)
        opt.dirstruct = 1;
       opt.timestamping = 1;
-      opt.reclevel = 0;
+      opt.reclevel = INFINITE_RECURSION;
       opt.remove_listing = 0;
     }
   return 1;