[svn] Added sanity checks for -k, -p, -r and -N when -O is given. Added fixes for...

[wget] / src / progress.h

diff --git a/src/progress.h b/src/progress.h
index 50cd211627aefec351248249161637ee94c59522..d663d8f6cbf8359bda680b05f69f544c9082cec4 100644 (file)
--- a/src/progress.h
+++ b/src/progress.h
@@ -1,5 +1,5 @@
 /* Download progress.
-   Copyright (C) 2001 Free Software Foundation, Inc.
+   Copyright (C) 2001-2006 Free Software Foundation, Inc.
 
 This file is part of GNU Wget.
 
@@ -14,14 +14,31 @@ 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, write to the Free Software Foundation, Inc.,
+51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 
-int valid_progress_implementation_p PARAMS ((const char *));
-void set_progress_implementation PARAMS ((const char *));
+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.  */
 
-void *progress_create PARAMS ((long, long));
-void progress_update PARAMS ((void *, long));
-void progress_finish PARAMS ((void *));
+#ifndef PROGRESS_H
+#define PROGRESS_H
 
-RETSIGTYPE progress_handle_sigwinch PARAMS ((int));
+bool valid_progress_implementation_p (const char *);
+void set_progress_implementation (const char *);
+void progress_schedule_redirect (void);
+
+void *progress_create (wgint, wgint);
+bool progress_interactive_p (void *);
+void progress_update (void *, wgint, double);
+void progress_finish (void *, double);
+
+void progress_handle_sigwinch (int);
+
+#endif /* PROGRESS_H */