X-Git-Url: http://sjero.net/git/?p=wget;a=blobdiff_plain;f=src%2Furl.h;h=6d18ed81f1f3c21d13e6af2131972136284b9af7;hp=c9590f51ed501ab2b21e5c2be8a64665252f55c9;hb=38a7829dcb4eb5dba28dbf0f05c6a80fea9217f8;hpb=293008f682e5fa9726136bc121bceadc136c77dc diff --git a/src/url.h b/src/url.h index c9590f51..6d18ed81 100644 --- a/src/url.h +++ b/src/url.h @@ -1,6 +1,7 @@ /* Declarations for url.c. Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, - 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. + 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, + Inc. This file is part of GNU Wget. @@ -36,6 +37,22 @@ as that of the covered work. */ #define DEFAULT_FTP_PORT 21 #define DEFAULT_HTTPS_PORT 443 +/* This represents how many characters less than the OS max name length a file + * should be. More precisely, a file name should be at most + * (NAME_MAX - CHOMP_BUFFER) characters in length. This number was arrived at + * by adding the lengths of all possible strings that could be appended to a + * file name later in the code (e.g. ".orig", ".html", etc.). This is + * hopefully plenty of extra characters, but I am not guaranteeing that a file + * name will be of the proper length by the time the code wants to open a + * file descriptor. */ +#define CHOMP_BUFFER 19 + +/* The flags that allow clobbering the file (opening with "wb"). + Defined here to avoid repetition later. #### This will require + rework. */ +#define ALLOW_CLOBBER (opt.noclobber || opt.always_rest || opt.timestamping \ + || opt.dirstruct || opt.output_document || opt.backups > 0) + /* Specifies how, or whether, user auth information should be included * in URLs regenerated from URL parse structures. */ enum url_auth_mode { @@ -84,6 +101,7 @@ struct url char *url_escape (const char *); char *url_escape_unsafe_and_reserved (const char *); +void url_unescape (char *); struct url *url_parse (const char *, int *, struct iri *iri, bool percent_encode); char *url_error (const char *, int); @@ -99,7 +117,7 @@ int scheme_default_port (enum url_scheme); void scheme_disable (enum url_scheme); char *url_string (const struct url *, enum url_auth_mode); -char *url_file_name (const struct url *); +char *url_file_name (const struct url *, char *); char *uri_merge (const char *, const char *);