[svn] A bunch of new features:

[wget] / src / url.h

diff --git a/src/url.h b/src/url.h
index 771f17a4e89776ebbca6c49cb300f84c3f65d42e..648193fa54f2bb16844348aed392e94d8508541e 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,6 +63,19 @@ typedef struct _urlpos
   struct _urlpos *next;        /* Next struct in list */
 } urlpos;
 
+/* downloaded_file() takes a parameter of this type and returns this type. */
+typedef enum
+{
+  /* 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;
 
 /* Function declarations */
 
@@ -74,6 +88,7 @@ struct urlinfo *newurl PARAMS ((void));
 void freeurl PARAMS ((struct urlinfo *, int));
 uerr_t urlproto PARAMS ((const char *));
 int skip_proto PARAMS ((const char *));
+int has_proto PARAMS ((const char *));
 int skip_uname PARAMS ((const char *));
 
 uerr_t parseurl PARAMS ((const char *, struct urlinfo *, int));
@@ -81,9 +96,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 *));
@@ -95,4 +112,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 *));
 
+downloaded_file_t downloaded_file PARAMS ((downloaded_file_t, const char *));
+
 #endif /* URL_H */