[svn] Committed my patches from <sxsbsw16sbu.fsf@florida.arsdigita.de>

[wget] / src / url.h

diff --git a/src/url.h b/src/url.h
index 87044cdd497c9309d54bb15a5df376cd4936e57c..0f55ec35b803d81ae97556aaaa0103f5861eb461 100644 (file)
--- a/src/url.h
+++ b/src/url.h
@@ -32,7 +32,8 @@ struct urlinfo
   char *host;                  /* Extracted hostname */
   unsigned short port;
   char ftp_type;
-  char *path, *dir, *file;     /* Path, as well as dir and file
+  char *path, *dir, *file, *qstring;   
+                                /* Path, dir, file, and query string
                                   (properly decoded) */
   char *user, *passwd;         /* Username and password */
   struct urlinfo *proxy;       /* The exact string to pass to proxy
@@ -62,10 +63,17 @@ typedef struct _urlpos
   struct _urlpos *next;        /* Next struct in list */
 } urlpos;
 
-/* Controls how downloaded_file() behaves. */
+/* downloaded_file() takes a parameter of this type and returns this type. */
 typedef enum
 {
-  ADD_FILE,
+  /* Return enumerators: */
+  FILE_NOT_ALREADY_DOWNLOADED = 0,
+
+  /* Return / parameter enumerators: */
+  FILE_DOWNLOADED_NORMALLY,
+  FILE_DOWNLOADED_AND_HTML_EXTENSION_ADDED,
+
+  /* Parameter enumerators: */
   CHECK_FOR_FILE
 } downloaded_file_t;
 
@@ -87,9 +95,11 @@ char *str_url PARAMS ((const struct urlinfo *, int));
 int url_equal PARAMS ((const char *, const char *));
 
 urlpos *get_urls_file PARAMS ((const char *));
-urlpos *get_urls_html PARAMS ((const char *, const char *, int));
+urlpos *get_urls_html PARAMS ((const char *, const char *, int, int));
 void free_urlpos PARAMS ((urlpos *));
 
+char *url_concat PARAMS ((const char *, const char *));
+
 void rotate_backups PARAMS ((const char *));
 int mkalldirs PARAMS ((const char *));
 char *url_filename PARAMS ((const struct urlinfo *));
@@ -101,6 +111,6 @@ int no_proxy_match PARAMS ((const char *, const char **));
 void convert_links PARAMS ((const char *, urlpos *));
 urlpos *add_url PARAMS ((urlpos *, const char *, const char *));
 
-boolean downloaded_file PARAMS ((downloaded_file_t, const char *));
+downloaded_file_t downloaded_file PARAMS ((downloaded_file_t, const char *));
 
 #endif /* URL_H */