X-Git-Url: http://sjero.net/git/?p=wget;a=blobdiff_plain;f=src%2Foptions.h;h=05e5894d1119692bb93ac78d6518a00519280f08;hp=7fda95e3a47098ad010ea328c24beff0345f2d86;hb=2f6aa1d7417df1dfc58597777686fbd77179b9fd;hpb=10da871ac441fe99f5d20dd8f1e9ec3797c0a5a2

diff --git a/src/options.h b/src/options.h
index 7fda95e3..05e5894d 100644
--- a/src/options.h
+++ b/src/options.h
@@ -1,5 +1,7 @@
 /* struct options.
-   Copyright (C) 1996-2006 Free Software Foundation, Inc.
+   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+   2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
+   Inc.
 
 This file is part of GNU Wget.
 
@@ -16,15 +18,16 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with Wget.  If not, see <http://www.gnu.org/licenses/>.
 
-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.  */
+Additional permission under GNU GPL version 3 section 7
+
+If you modify this program, or any covered work, by linking or
+combining it with the OpenSSL project's OpenSSL library (or a
+modified version of that library), containing parts covered by the
+terms of the OpenSSL or SSLeay licenses, the Free Software Foundation
+grants you additional permission to convey the resulting work.
+Corresponding Source for a non-source form of such a combination
+shall include the source code for the parts of OpenSSL used as well
+as that of the covered work.  */
 
 struct options
 {
@@ -52,11 +55,15 @@ struct options
   bool protocol_directories;	/* Whether to prepend "http"/"ftp" to dirs. */
   bool noclobber;		/* Disables clobbering of existing
 				   data. */
+  bool unlink;			/* remove file before clobbering */
   char *dir_prefix;		/* The top of directory tree */
   char *lfilename;		/* Log filename */
   char *input_filename;		/* Input filename */
+  char *choose_config;		/* Specified config file */
   bool force_html;		/* Is the input file an HTML file? */
 
+  char *default_page;           /* Alternative default page (index file) */
+
   bool spider;			/* Is Wget in spider mode? */
 
   char **accepts;		/* List of patterns to accept. */
@@ -83,7 +90,8 @@ struct options
 
   char *user;			/* Generic username */
   char *passwd;			/* Generic password */
-  
+  bool ask_passwd;              /* Ask for password? */
+
   bool always_rest;		/* Always use REST. */
   char *ftp_user;		/* FTP username */
   char *ftp_passwd;		/* FTP password */
@@ -119,10 +127,6 @@ struct options
   SUM_SIZE_INT quota;		/* Maximum file size to download and
 				   store. */
 
-  int numurls;			/* Number of successfully downloaded
-				   URLs #### should be removed because
-				   it's not a setting, but a global var */
-
   bool server_response;		/* Do we print server response? */
   bool save_headers;		/* Do we save headers together with
 				   file? */
@@ -131,6 +135,10 @@ struct options
   bool debug;			/* Debugging on/off */
 #endif
 
+#ifdef USE_WATT32
+  bool wdebug;                  /* Watt-32 tcp/ip debugging on/off */
+#endif
+
   bool timestamping;		/* Whether to use time-stamping. */
 
   bool backup_converted;	/* Do we save pre-converted files as *.orig? */
@@ -157,7 +165,7 @@ struct options
   bool delete_after;		/* Whether the files will be deleted
 				   after download. */
 
-  bool html_extension;		/* Use ".html" extension on all text/html? */
+  bool adjust_extension;		/* Use ".html" extension on all text/html? */
 
   bool page_requisites;		/* Whether we need to download all files
 				   necessary to display a page properly. */
@@ -204,6 +212,8 @@ struct options
   bool restrict_files_ctrl;	/* non-zero if control chars in URLs
 				   are restricted from appearing in
 				   generated file names. */
+  bool restrict_files_nonascii; /* non-zero if bytes with values greater
+                                   than 127 are restricted. */
   enum {
     restrict_no_case_restriction,
     restrict_lowercase,
@@ -226,8 +236,23 @@ struct options
     prefer_none
   } prefer_family;		/* preferred address family when more
 				   than one type is available */
-  
+
   bool content_disposition;	/* Honor HTTP Content-Disposition header. */
+  bool auth_without_challenge;  /* Issue Basic authentication creds without
+                                   waiting for a challenge. */
+
+  bool enable_iri;
+  char *encoding_remote;
+  char *locale;
+
+  bool trustservernames;
+#ifdef __VMS
+  int ftp_stmlf;                /* Force Stream_LF format for binary FTP. */
+#endif /* def __VMS */
+
+  bool useservertimestamps;  	/* Update downloaded files' timestamps to
+				   match those on server? */
+
 };
 
 extern struct options opt;