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

[wget] / src / retr.h

diff --git a/src/retr.h b/src/retr.h
index cabb817d75e743c4f369ff33a8e6d17f85eb06d4..9ebf255615cc2a319ad4d6e44ca899c5caff5179 100644 (file)
--- a/src/retr.h
+++ b/src/retr.h
@@ -1,11 +1,11 @@
 /* Declarations for retr.c.
-   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
-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,
@@ -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
-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
@@ -30,6 +29,13 @@ so, delete this exception statement from your version.  */
 #ifndef RETR_H
 #define RETR_H
 
+/* These global vars should be made static to retr.c and exported via
+   functions! */
+extern SUM_SIZE_INT total_downloaded_bytes;
+extern double total_download_time;
+extern FILE *output_stream;
+extern bool output_stream_regular;
+
 /* Flags for fd_read_body. */
 enum {
   rb_read_exactly  = 1,
@@ -38,15 +44,15 @@ enum {
 
 int fd_read_body (int, FILE *, wgint, wgint, wgint *, wgint *, double *, int);
 
-typedef const char *(*hunk_terminator_t) (const char *, int, int);
+typedef const char *(*hunk_terminator_t) (const char *, const char *, int);
 
 char *fd_read_hunk (int, hunk_terminator_t, long, long);
 char *fd_read_line (int);
 
-uerr_t retrieve_url (const char *, char **, char **, const char *, int *);
+uerr_t retrieve_url (const char *, char **, char **, const char *, int *, bool);
 uerr_t retrieve_from_file (const char *, bool, int *);
 
-char *retr_rate (wgint, double, bool);
+const char *retr_rate (wgint, double);
 double calc_rate (wgint, double, int *);
 void printwhat (int, int);
 
@@ -54,13 +60,6 @@ void sleep_between_retrievals (int);
 
 void rotate_backups (const char *);
 
-/* Because there's no http.h. */
-
-struct url;
-
-uerr_t http_loop (struct url *, char **, char **, const char *, int *,
-                 struct url *);
-void save_cookies (void);
-
+bool url_uses_proxy (const char *);
 
 #endif /* RETR_H */