X-Git-Url: http://sjero.net/git/?a=blobdiff_plain;f=src%2Foptions.h;h=e9fe2d2c0b6f7679e80629d71cb19f1bc62e882a;hb=b5c9573ad6396acf3e4e33d0ae0db65b413b0d66;hp=0480acb9906420a6f05be607be92eee4c1a197b4;hpb=c2c71c32cf7e75336bb45fc299658910e0f9f8af;p=wget

diff --git a/src/options.h b/src/options.h
index 0480acb9..e9fe2d2c 100644
--- a/src/options.h
+++ b/src/options.h
@@ -1,6 +1,6 @@
 /* struct options.
-   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-   2004, 2005, 2006, 2007 Free Software Foundation, Inc.
+   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+   2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 
 This file is part of GNU Wget.
 
@@ -17,15 +17,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
 {
@@ -53,11 +54,14 @@ 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 */
   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. */
@@ -84,7 +88,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 */
@@ -120,10 +125,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? */
@@ -132,7 +133,7 @@ struct options
   bool debug;			/* Debugging on/off */
 #endif
 
-#ifdef MSDOS
+#ifdef USE_WATT32
   bool wdebug;                  /* Watt-32 tcp/ip debugging on/off */
 #endif
 
@@ -162,7 +163,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. */
@@ -209,6 +210,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,
@@ -231,8 +234,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;