The transformation is done in place. If you need the original
string intact, make a copy before calling this function. */
-static void
+void
url_unescape (char *s)
{
char *t = s; /* t - tortoise */
if (!iri->utf8_encode)
new_url = NULL;
else
- iri->orig_url = xstrdup (url);
+ {
+ iri->orig_url = xstrdup (url);
+ percent_encode = true;
+ }
}
/* XXX XXX Could that change introduce (security) bugs ??? XXX XXX*/
*TAIL (dest) = 0;
}
-/* Shorten DEST to LENGTH. */
-static void
-shorten_length (size_t length, struct growable *dest)
-{
- if (length < dest->tail)
- dest->tail = length;
-
- append_null (dest);
-}
-
/* Append CH to DEST. */
static void
append_char (char ch, struct growable *dest)
append_char ('\0', &temp_fnres);
/* Check that the length of the file name is acceptable. */
+#ifdef WINDOWS
+ if (MAX_PATH > (fnres.tail + CHOMP_BUFFER + 2))
+ {
+ max_length = MAX_PATH - (fnres.tail + CHOMP_BUFFER + 2);
+ /* FIXME: In Windows a filename is usually limited to 255 characters.
+ To really be accurate you could call GetVolumeInformation() to get
+ lpMaximumComponentLength
+ */
+ if (max_length > 255)
+ {
+ max_length = 255;
+ }
+ }
+ else
+ {
+ max_length = 0;
+ }
+#else
max_length = get_max_length (fnres.base, fnres.tail, _PC_NAME_MAX) - CHOMP_BUFFER;
+#endif
if (max_length > 0 && strlen (temp_fnres.base) > max_length)
{
logprintf (LOG_NOTQUIET, "The name is too long, %lu chars total.\n",
2) Retrieval with regetting.
3) Timestamping is used.
4) Hierarchy is built.
+ 5) Backups are specified.
The exception is the case when file does exist and is a
directory (see `mkalldirs' for explanation). */
- if ((opt.noclobber || opt.always_rest || opt.timestamping || opt.dirstruct)
+ if (ALLOW_CLOBBER
&& !(file_exists_p (fname) && !file_non_directory_p (fname)))
{
unique = fname;
if (url->passwd)
{
if (auth_mode == URL_AUTH_HIDE_PASSWD)
- quoted_passwd = HIDDEN_PASSWORD;
+ quoted_passwd = (char *) HIDDEN_PASSWORD;
else
quoted_passwd = url_escape_allow_passthrough (url->passwd);
}
#endif
static const char *
-run_test (char *test, char *expected_result, enum url_scheme scheme,
+run_test (const char *test, const char *expected_result, enum url_scheme scheme,
bool expected_change)
{
char *test_copy = xstrdup (test);
const char *
test_path_simplify (void)
{
- static struct {
- char *test, *result;
+ static const struct {
+ const char *test, *result;
enum url_scheme scheme;
bool should_modify;
} tests[] = {
{ "a/b/../../c", "c", SCHEME_HTTP, true },
{ "./a/../b", "b", SCHEME_HTTP, true }
};
- int i;
+ unsigned i;
for (i = 0; i < countof (tests); i++)
{
const char *message;
- char *test = tests[i].test;
- char *expected_result = tests[i].result;
+ const char *test = tests[i].test;
+ const char *expected_result = tests[i].result;
enum url_scheme scheme = tests[i].scheme;
bool expected_change = tests[i].should_modify;
+
message = run_test (test, expected_result, scheme, expected_change);
if (message) return message;
}
}
const char *
-test_append_uri_pathel()
+test_append_uri_pathel(void)
{
- int i;
- struct {
- char *original_url;
- char *input;
+ unsigned i;
+ static const struct {
+ const char *original_url;
+ const char *input;
bool escaped;
- char *expected_result;
+ const char *expected_result;
} test_array[] = {
{ "http://www.yoyodyne.com/path/", "somepage.html", false, "http://www.yoyodyne.com/path/somepage.html" },
};
- for (i = 0; i < sizeof(test_array)/sizeof(test_array[0]); ++i)
+ for (i = 0; i < countof(test_array); ++i)
{
struct growable dest;
const char *p = test_array[i].input;
return NULL;
}
-const char*
-test_are_urls_equal()
+const char *
+test_are_urls_equal(void)
{
- int i;
- struct {
- char *url1;
- char *url2;
+ unsigned i;
+ static const struct {
+ const char *url1;
+ const char *url2;
bool expected_result;
} test_array[] = {
{ "http://www.adomain.com/apath/", "http://www.adomain.com/apath/", true },
{ "http://www.adomain.com/path%2f", "http://www.adomain.com/path/", false },
};
- for (i = 0; i < sizeof(test_array)/sizeof(test_array[0]); ++i)
+ for (i = 0; i < countof(test_array); ++i)
{
mu_assert ("test_are_urls_equal: wrong result",
are_urls_equal (test_array[i].url1, test_array[i].url2) == test_array[i].expected_result);