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

[wget] / src / utils.h

diff --git a/src/utils.h b/src/utils.h
index 0783602d6c131cde7722081aaebec98889acded6..cb2dbbca191107ac5ed84a5d0dcde826b3eb4248 100644 (file)
--- a/src/utils.h
+++ b/src/utils.h
@@ -1,11 +1,11 @@
 /* Declarations for utils.c.
 /* Declarations for utils.c.

-   Copyright (C) 1995, 1996, 1997, 1998 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


@@ -30,17 +29,6 @@ so, delete this exception statement from your version.  */
 #ifndef UTILS_H
 #define UTILS_H
 
 #ifndef UTILS_H
 #define UTILS_H
 

-enum accd {
-   ALLABS = 1
-};
-
-/* A linked list of strings.  The list is ordered alphabetically.  */
-typedef struct _slist
-{
-  char *string;
-  struct _slist *next;
-} slist;
-

 struct hash_table;
 
 struct file_memory {
 struct hash_table;
 
 struct file_memory {


@@ -49,75 +37,91 @@ struct file_memory {
   int mmap_p;
 };
 
   int mmap_p;
 };
 

-struct wget_timer;
+#define HYPHENP(x) (*(x) == '-' && !*((x) + 1))

 
 

-char *time_str PARAMS ((time_t *));
-char *datetime_str PARAMS ((time_t *));
+char *time_str (time_t);
+char *datetime_str (time_t);

 
 #ifdef DEBUG_MALLOC
 void print_malloc_debug_stats ();
 #endif
 
 
 #ifdef DEBUG_MALLOC
 void print_malloc_debug_stats ();
 #endif
 

-char *xstrdup_lower PARAMS ((const char *));
-int count_char PARAMS ((const char *, char));
-
-char *strdupdelim PARAMS ((const char *, const char *));
-char **sepstring PARAMS ((const char *));
-int frontcmp PARAMS ((const char *, const char *));
-char *pwd_cuserid PARAMS ((char *));
-void fork_to_background PARAMS ((void));
-
-void touch PARAMS ((const char *, time_t));
-int remove_link PARAMS ((const char *));
-int file_exists_p PARAMS ((const char *));
-int file_non_directory_p PARAMS ((const char *));
-long file_size PARAMS ((const char *));
-int make_directory PARAMS ((const char *));
-char *unique_name PARAMS ((const char *, int));
-char *file_merge PARAMS ((const char *, const char *));
-
-int acceptable PARAMS ((const char *));
-int accdir PARAMS ((const char *s, enum accd));
-char *suffix PARAMS ((const char *s));
-int match_tail PARAMS ((const char *, const char *, int));
-
-int has_html_suffix_p PARAMS ((const char *));
-
-char *read_whole_line PARAMS ((FILE *));
-struct file_memory *read_file PARAMS ((const char *));
-void read_file_free PARAMS ((struct file_memory *));
-
-void free_vec PARAMS ((char **));
-char **merge_vecs PARAMS ((char **, char **));
-slist *slist_append PARAMS ((slist *, const char *));
-slist *slist_prepend PARAMS ((slist *, const char *));
-slist *slist_nreverse PARAMS ((slist *));
-int slist_contains PARAMS ((slist *, const char *));
-void slist_free PARAMS ((slist *));
-
-void string_set_add PARAMS ((struct hash_table *, const char *));
-int string_set_contains PARAMS ((struct hash_table *, const char *));
-void string_set_free PARAMS ((struct hash_table *));
-void free_keys_and_values PARAMS ((struct hash_table *));
-
-char *legible PARAMS ((long));
-char *legible_very_long PARAMS ((VERY_LONG_TYPE));
-int numdigit PARAMS ((long));
-char *number_to_string PARAMS ((char *, long));
-
-struct wget_timer *wtimer_allocate PARAMS ((void));
-struct wget_timer *wtimer_new PARAMS ((void));
-void wtimer_delete PARAMS ((struct wget_timer *));
-void wtimer_reset PARAMS ((struct wget_timer *));
-double wtimer_elapsed PARAMS ((struct wget_timer *));
-double wtimer_granularity PARAMS ((void));
-
-char *html_quote_string PARAMS ((const char *));
-
-int determine_screen_width PARAMS ((void));
-int random_number PARAMS ((int));
-double random_float PARAMS ((void));
-
-int run_with_timeout PARAMS ((double, void (*) (void *), void *));
+char *xstrdup_lower (const char *);
+
+char *strdupdelim (const char *, const char *);
+char **sepstring (const char *);
+bool subdir_p (const char *, const char *);
+void fork_to_background (void);
+
+char *aprintf (const char *, ...) GCC_FORMAT_ATTR (1, 2);
+char *concat_strings (const char *, ...);
+
+void touch (const char *, time_t);
+int remove_link (const char *);
+bool file_exists_p (const char *);
+bool file_non_directory_p (const char *);
+wgint file_size (const char *);
+int make_directory (const char *);
+char *unique_name (const char *, bool);
+FILE *unique_create (const char *, bool, char **);
+FILE *fopen_excl (const char *, bool);
+char *file_merge (const char *, const char *);
+
+int fnmatch_nocase (const char *, const char *, int);
+bool acceptable (const char *);
+bool accdir (const char *s);
+char *suffix (const char *s);
+bool match_tail (const char *, const char *, bool);
+bool has_wildcards_p (const char *);
+
+bool has_html_suffix_p (const char *);
+
+char *read_whole_line (FILE *);
+struct file_memory *read_file (const char *);
+void read_file_free (struct file_memory *);
+
+void free_vec (char **);
+char **merge_vecs (char **, char **);
+char **vec_append (char **, const char *);
+
+void string_set_add (struct hash_table *, const char *);
+int string_set_contains (struct hash_table *, const char *);
+void string_set_to_array (struct hash_table *, char **);
+void string_set_free (struct hash_table *);
+void free_keys_and_values (struct hash_table *);
+
+const char *with_thousand_seps (wgint);
+
+/* human_readable must be able to accept wgint and SUM_SIZE_INT
+   arguments.  On machines where wgint is 32-bit, declare it to accept
+   double.  */
+#if SIZEOF_WGINT >= 8
+# define HR_NUMTYPE wgint
+#else
+# define HR_NUMTYPE double
+#endif
+char *human_readable (HR_NUMTYPE);
+
+
+int numdigit (wgint);
+char *number_to_string (char *, wgint);
+char *number_to_static_string (wgint);
+
+int determine_screen_width (void);
+int random_number (int);
+double random_float (void);
+
+bool run_with_timeout (double, void (*) (void *), void *);
+void xsleep (double);
+
+/* How many bytes it will take to store LEN bytes in base64.  */
+#define BASE64_LENGTH(len) (4 * (((len) + 2) / 3))
+
+int base64_encode (const void *, int, char *);
+int base64_decode (const char *, void *);
+
+void stable_sort (void *, size_t, size_t, int (*) (const void *, const void *));
+
+const char *print_decimal (double);

 
 #endif /* UTILS_H */
 
 #endif /* UTILS_H */