[svn] Merge of fix for bugs 20341 and 20410.

[wget] / src / options.h

diff --git a/src/options.h b/src/options.h
index 94f7baec975cf5d747b80b647fd1c1c52c1ddadd..0267e37668c0e08c89274f67888c53e056da2677 100644 (file)
--- a/src/options.h
+++ b/src/options.h
@@ -1,11 +1,11 @@
 /* struct options.
 /* struct options.

-   Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+   Copyright (C) 1996-2006 Free Software Foundation, Inc.

 
 This file is part of GNU Wget.
 
 GNU Wget is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 
 This file is part of GNU Wget.
 
 GNU Wget is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

-the Free Software Foundation; either version 2 of the License, or
+the Free Software Foundation; either version 3 of the License, or

 (at your option) any later version.
 
 GNU Wget is distributed in the hope that it will be useful,
 (at your option) any later version.
 
 GNU Wget is distributed in the hope that it will be useful,


@@ -14,8 +14,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 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.
+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
 
 In addition, as a special exception, the Free Software Foundation
 gives permission to link the code of its release of Wget with the


@@ -29,14 +28,12 @@ so, delete this exception statement from your version.  */
 
 struct options
 {
 
 struct options
 {

-  bool verbose;                        /* Are we verbose? */
+  int verbose;                 /* Are we verbose?  (First set to -1,
+                                   hence not boolean.) */

   bool quiet;                  /* Are we quiet? */
   int ntry;                    /* Number of tries per URL */
   bool retry_connrefused;      /* Treat CONNREFUSED as non-fatal. */
   bool background;             /* Whether we should work in background. */
   bool quiet;                  /* Are we quiet? */
   int ntry;                    /* Number of tries per URL */
   bool retry_connrefused;      /* Treat CONNREFUSED as non-fatal. */
   bool background;             /* Whether we should work in background. */

-  bool kill_longer;            /* Do we reject messages with *more*
-                                  data than specified in
-                                  content-length? */

   bool ignore_length;          /* Do we heed content-length at all?  */
   bool recursive;              /* Are we recursive? */
   bool spanhost;                       /* Do we span across hosts in
   bool ignore_length;          /* Do we heed content-length at all?  */
   bool recursive;              /* Are we recursive? */
   bool spanhost;                       /* Do we span across hosts in


@@ -65,6 +62,8 @@ struct options
   char **excludes;             /* List of excluded FTP directories. */
   char **includes;             /* List of FTP directories to
                                   follow. */
   char **excludes;             /* List of excluded FTP directories. */
   char **includes;             /* List of FTP directories to
                                   follow. */

+  bool ignore_case;            /* Whether to ignore case when
+                                  matching dirs and files */

 
   char **domains;              /* See host.c */
   char **exclude_domains;
 
   char **domains;              /* See host.c */
   char **exclude_domains;


@@ -115,7 +114,7 @@ struct options
 
   wgint limit_rate;            /* Limit the download rate to this
                                   many bps. */
 
   wgint limit_rate;            /* Limit the download rate to this
                                   many bps. */

-  LARGE_INT quota;             /* Maximum file size to download and
+  SUM_SIZE_INT quota;          /* Maximum file size to download and

                                   store. */
 
   int numurls;                 /* Number of successfully downloaded
                                   store. */
 
   int numurls;                 /* Number of successfully downloaded


@@ -203,6 +202,11 @@ struct options
   bool restrict_files_ctrl;    /* non-zero if control chars in URLs
                                   are restricted from appearing in
                                   generated file names. */
   bool restrict_files_ctrl;    /* non-zero if control chars in URLs
                                   are restricted from appearing in
                                   generated file names. */

+  enum {
+    restrict_no_case_restriction,
+    restrict_lowercase,
+    restrict_uppercase
+  } restrict_files_case;       /* file name case restriction. */

 
   bool strict_comments;                /* whether strict SGML comments are
                                   enforced.  */
 
   bool strict_comments;                /* whether strict SGML comments are
                                   enforced.  */


@@ -220,6 +224,8 @@ struct options
     prefer_none
   } prefer_family;             /* preferred address family when more
                                   than one type is available */
     prefer_none
   } prefer_family;             /* preferred address family when more
                                   than one type is available */

+  
+  bool content_disposition;    /* Honor HTTP Content-Disposition header. */

 };
 
 extern struct options opt;
 };
 
 extern struct options opt;