X-Git-Url: http://sjero.net/git/?p=wget;a=blobdiff_plain;f=src%2Futils.h;h=3e35e3339cf0a786351c7449f6ad6baf1e1d865d;hp=7a8e223dc5ee1d8438a147512cb3d96de938498f;hb=c6c171bed7e311f2dc261060d2972da6e95f135d;hpb=fd42ae13117c207c91558c2f466ffdbf6bb55039

diff --git a/src/utils.h b/src/utils.h
index 7a8e223d..3e35e333 100644
--- a/src/utils.h
+++ b/src/utils.h
@@ -15,7 +15,17 @@ 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.  */
+Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+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.  */
 
 #ifndef UTILS_H
 #define UTILS_H
@@ -39,6 +49,8 @@ struct file_memory {
   int mmap_p;
 };
 
+#define HYPHENP(x) (*(x) == '-' && !*((x) + 1))
+
 struct wget_timer;
 
 char *time_str PARAMS ((time_t *));
@@ -54,7 +66,6 @@ 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));
@@ -63,13 +74,14 @@ 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 *));
+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_wildcards_p PARAMS ((const char *));
 
 int has_html_suffix_p PARAMS ((const char *));
 
@@ -91,7 +103,7 @@ 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));
+char *legible_large_int PARAMS ((LARGE_INT));
 int numdigit PARAMS ((long));
 char *number_to_string PARAMS ((char *, long));
 
@@ -99,14 +111,15 @@ 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 *));
-long wtimer_elapsed PARAMS ((struct wget_timer *));
-long wtimer_granularity PARAMS ((void));
+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 ((long, void (*) (void *), void *));
+int run_with_timeout PARAMS ((double, void (*) (void *), void *));
 
 #endif /* UTILS_H */