X-Git-Url: http://sjero.net/git/?p=wget;a=blobdiff_plain;f=src%2Foptions.h;h=7010cd414746d148ebf3fea285246c28aa50c9d7;hp=c6f21b5ba6b2efa6b71e14030b388b7c22a94119;hb=0a3697ad652df74ffeec8a97e1d23c343d8ef391;hpb=0b056d17201d2bae32857dbec4c8f7a95578cdf9

diff --git a/src/options.h b/src/options.h
index c6f21b5b..7010cd41 100644
--- a/src/options.h
+++ b/src/options.h
@@ -15,7 +15,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.  */
 
 /* Needed for FDP.  */
 #include <stdio.h>
@@ -25,6 +35,7 @@ struct options
   int verbose;			/* Are we verbose? */
   int quiet;			/* Are we quiet? */
   int ntry;			/* Number of tries per URL */
+  int retry_connrefused;	/* Treat CONNREFUSED as non-fatal. */
   int background;		/* Whether we should work in background. */
   int kill_longer;		/* Do we reject messages with *more*
 				   data than specified in
@@ -36,9 +47,6 @@ struct options
   int relative_only;		/* Follow only relative links. */
   int no_parent;		/* Restrict access to the parent
 				   directory.  */
-  int simple_check;		/* Should we use simple checking
-				   (strcmp) or do we create a host
-				   hash and call gethostbyname? */
   int reclevel;			/* Maximum level of recursion */
   int dirstruct;		/* Do we build the directory structure
 				  as we go along? */
@@ -49,7 +57,6 @@ struct options
 				   data. */
   char *dir_prefix;		/* The top of directory tree */
   char *lfilename;		/* Log filename */
-  int no_flush;			/* If non-zero, inhibit flushing log. */
   char *input_filename;		/* Input filename */
   int force_html;		/* Is the input file an HTML file? */
 
@@ -63,6 +70,7 @@ struct options
 
   char **domains;		/* See host.c */
   char **exclude_domains;
+  int dns_cache;		/* whether we cache DNS lookups. */
 
   char **follow_tags;           /* List of HTML tags to recursively follow. */
   char **ignore_tags;           /* List of HTML tags to ignore if recursing. */
@@ -96,16 +104,20 @@ struct options
   char *http_proxy, *ftp_proxy, *https_proxy;
   char **no_proxy;
   char *base_href;
+  char *progress_type;		/* progress indicator type. */
   char *proxy_user; /*oli*/
   char *proxy_passwd;
 #ifdef HAVE_SELECT
   long timeout;			/* The value of read timeout in
 				   seconds. */
 #endif
+  int random_wait;		/* vary from 0 .. wait secs by random()? */
   long wait;			/* The wait period between retrievals. */
   long waitretry;		/* The wait period between retries. - HEH */
   int use_robots;		/* Do we heed robots.txt? */
 
+  long limit_rate;		/* Limit the download rate to this
+				   many bps. */
   long quota;			/* Maximum number of bytes to
 				   retrieve. */
   VERY_LONG_TYPE downloaded;	/* How much we downloaded already. */
@@ -139,6 +151,7 @@ struct options
   int htmlify;			/* Do we HTML-ify the OS-dependent
 				   listings? */
 
+  char *dot_style;
   long dot_bytes;		/* How many bytes in a printing
 				   dot. */
   int dots_in_line;		/* How many dots in one line. */
@@ -151,21 +164,32 @@ struct options
 
   int page_requisites;		/* Whether we need to download all files
 				   necessary to display a page properly. */
-
-  struct sockaddr_in *bind_address; /* What local IP address to bind to. */
-
+  char *bind_address;		/* What local IP address to bind to. */
 #ifdef HAVE_SSL
+  char *sslcadir;		/* CA directory (hash files) */
+  char *sslcafile;		/* CA File to use */
   char *sslcertfile;		/* external client cert to use. */
   char *sslcertkey;		/* the keyfile for this certificate
 				   (if not internal) included in the
 				   certfile. */
+  int   sslcerttype;		/* 0 = PEM / 1=ASN1 (DER) */
+  int   sslcheckcert;		/* 0 do not check / 1 check server cert */
+  char *sslegdsock;             /* optional socket of the egd daemon */
+  int   sslprotocol;		/* 0 = auto / 1 = v2 / 2 = v3 / 3 = TLSv1 */
 #endif /* HAVE_SSL */
 
   int   cookies;
   char *cookies_input;
   char *cookies_output;
+
+  char *post_data;		/* POST query string */
+  char *post_file_name;		/* File to post */
+
+  enum {
+    restrict_none,
+    restrict_shell,
+    restrict_windows
+  } restrict_file_names;	/* whether we restrict file name chars. */
 };
 
-#ifndef OPTIONS_DEFINED_HERE
 extern struct options opt;
-#endif