Automated merge.

[wget] / src / options.h

diff --git a/src/options.h b/src/options.h
index e0d7521da4f054e61e2930c287b5cda4d6be94cb..382fe312c516aae637ba25bf57fe9b9de55f047a 100644 (file)
--- a/src/options.h
+++ b/src/options.h
@@ -59,6 +59,8 @@ struct options
   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. */
@@ -85,6 +87,7 @@ 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 */
@@ -121,10 +124,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? */
@@ -235,7 +234,11 @@ struct options
   
   bool content_disposition;    /* Honor HTTP Content-Disposition header. */
   bool auth_without_challenge;  /* Issue Basic authentication creds without
-                                  waiting for a challenge. */
+                                   waiting for a challenge. */
+
+  bool enable_iri;
+  char *encoding_remote;
+  char *locale;
 
 #ifdef __VMS
   int ftp_stmlf;                /* Force Stream_LF format for binary FTP. */