mirror of
https://github.com/curl/curl.git
synced 2026-04-13 12:41:42 +08:00
4deea9396b
To make the source code match the functions called at runtime. And to avoid the preprocessor trick that may introduces build issues. Before this patch, libtests, tunits and units were calling a mixture of curl and system printf calls, then transformed them all to curl printf calls by including `curl_printf.h`. Changes made: - tests: stop including `curl_printf.h`. - libtest: switch a couple of outlier system printf calls to curl printf. - unit: use more curl printf to avoid casts and show whole values. - unit: switch remaining calls to curl printf explicitly. - tunit: switch to call curl printf explicitly. - libtest, tunit, unit: ban system printf. - unit1307, unit1607, unit1609, unit1652, unit1655, unit3214: bump types/masks to avoid casts. After this patch: - libtests, tunits, units: use exclusively curl printf. (as before, but explicitly, without relying on redefinitions.) - servers: is unchanged (it can only use system printf). Closes #18814
120 lines
3.4 KiB
C
120 lines
3.4 KiB
C
/***************************************************************************
|
|
* _ _ ____ _
|
|
* Project ___| | | | _ \| |
|
|
* / __| | | | |_) | |
|
|
* | (__| |_| | _ <| |___
|
|
* \___|\___/|_| \_\_____|
|
|
*
|
|
* Copyright (C) Daniel Stenberg, <daniel@haxx.se>, et al.
|
|
*
|
|
* This software is licensed as described in the file COPYING, which
|
|
* you should have received as part of this distribution. The terms
|
|
* are also available at https://curl.se/docs/copyright.html.
|
|
*
|
|
* You may opt to use, copy, modify, merge, publish, distribute and/or sell
|
|
* copies of the Software, and permit persons to whom the Software is
|
|
* furnished to do so, under the terms of the COPYING file.
|
|
*
|
|
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
|
|
* KIND, either express or implied.
|
|
*
|
|
* SPDX-License-Identifier: curl
|
|
*
|
|
***************************************************************************/
|
|
#include "unitcheck.h"
|
|
|
|
static CURLcode t1396_setup(void)
|
|
{
|
|
CURLcode res = CURLE_OK;
|
|
global_init(CURL_GLOBAL_ALL);
|
|
return res;
|
|
}
|
|
|
|
static void t1396_stop(CURL *easy)
|
|
{
|
|
if(easy)
|
|
curl_easy_cleanup(easy);
|
|
curl_global_cleanup();
|
|
}
|
|
|
|
static CURLcode test_unit1396(const char *arg)
|
|
{
|
|
CURL *easy;
|
|
|
|
UNITTEST_BEGIN(t1396_setup())
|
|
|
|
struct test {
|
|
const char *in;
|
|
int inlen;
|
|
const char *out;
|
|
int outlen;
|
|
};
|
|
|
|
/* unescape, this => that */
|
|
const struct test list1[] = {
|
|
{"%61", 3, "a", 1},
|
|
{"%61a", 4, "aa", 2},
|
|
{"%61b", 4, "ab", 2},
|
|
{"%6 1", 4, "%6 1", 4},
|
|
{"%61", 1, "%", 1},
|
|
{"%61", 2, "%6", 2},
|
|
{"%6%a", 4, "%6%a", 4},
|
|
{"%6a", 0, "j", 1},
|
|
{"%FF", 0, "\xff", 1},
|
|
{"%FF%00%ff", 9, "\xff\x00\xff", 3},
|
|
{"%-2", 0, "%-2", 3},
|
|
{"%FG", 0, "%FG", 3},
|
|
{NULL, 0, NULL, 0} /* end of list marker */
|
|
};
|
|
/* escape, this => that */
|
|
const struct test list2[] = {
|
|
{"a", 1, "a", 1},
|
|
{"/", 1, "%2F", 3},
|
|
{"a=b", 3, "a%3Db", 5},
|
|
{"a=b", 0, "a%3Db", 5},
|
|
{"a=b", 1, "a", 1},
|
|
{"a=b", 2, "a%3D", 4},
|
|
{"1/./0", 5, "1%2F.%2F0", 9},
|
|
{"-._~!#%&", 0, "-._~%21%23%25%26", 16},
|
|
{"a", 2, "a%00", 4},
|
|
{"a\xff\x01g", 4, "a%FF%01g", 8},
|
|
{NULL, 0, NULL, 0} /* end of list marker */
|
|
};
|
|
int i;
|
|
|
|
easy = curl_easy_init();
|
|
abort_unless(easy != NULL, "returned NULL!");
|
|
for(i = 0; list1[i].in; i++) {
|
|
int outlen;
|
|
char *out = curl_easy_unescape(easy,
|
|
list1[i].in, list1[i].inlen,
|
|
&outlen);
|
|
|
|
abort_unless(out != NULL, "returned NULL!");
|
|
fail_unless(outlen == list1[i].outlen, "wrong output length returned");
|
|
fail_unless(!memcmp(out, list1[i].out, list1[i].outlen),
|
|
"bad output data returned");
|
|
|
|
curl_mprintf("curl_easy_unescape test %d DONE\n", i);
|
|
|
|
curl_free(out);
|
|
}
|
|
|
|
for(i = 0; list2[i].in; i++) {
|
|
int outlen;
|
|
char *out = curl_easy_escape(easy, list2[i].in, list2[i].inlen);
|
|
abort_unless(out != NULL, "returned NULL!");
|
|
|
|
outlen = (int)strlen(out);
|
|
fail_unless(outlen == list2[i].outlen, "wrong output length returned");
|
|
fail_unless(!memcmp(out, list2[i].out, list2[i].outlen),
|
|
"bad output data returned");
|
|
|
|
curl_mprintf("curl_easy_escape test %d DONE (%s)\n", i, out);
|
|
|
|
curl_free(out);
|
|
}
|
|
|
|
UNITTEST_END(t1396_stop(easy))
|
|
}
|