mirror of
https://github.com/curl/curl.git
synced 2026-04-15 01:05:56 +08:00
Before this patch curl used the C preprocessor to override standard memory allocation symbols: malloc, calloc, strdup, realloc, free. The goal of these is to replace them with curl's debug wrappers in `CURLDEBUG` builds, another was to replace them with the wrappers calling user-defined allocators in libcurl. This solution needed a bunch of workarounds to avoid breaking external headers: it relied on include order to do the overriding last. For "unity" builds it needed to reset overrides before external includes. Also in test apps, which are always built as single source files. It also needed the `(symbol)` trick to avoid overrides in some places. This would still not fix cases where the standard symbols were macros. It was also fragile and difficult to figure out which was the actual function behind an alloc or free call in a specific piece of code. This in turn caused bugs where the wrong allocator was accidentally called. To avoid these problems, this patch replaces this solution with `curlx_`-prefixed allocator macros, and mapping them _once_ to either the libcurl wrappers, the debug wrappers or the standard ones, matching the rest of the code in libtests. This concludes the long journey to avoid redefining standard functions in the curl codebase. Note: I did not update `packages/OS400/*.c` sources. They did not `#include` `curl_setup.h`, `curl_memory.h` or `memdebug.h`, meaning the overrides were never applied to them. This may or may not have been correct. For now I suppressed the direct use of standard allocators via a local `.checksrc`. Probably they (except for `curlcl.c`) should be updated to include `curl_setup.h` and use the `curlx_` macros. This patch changes mappings in two places: - `lib/curl_threads.c` in libtests: Before this patch it mapped to libcurl allocators. After, it maps to standard allocators, like the rest of libtests code. - `units`: before this patch it mapped to standard allocators. After, it maps to libcurl allocators. Also: - drop all position-dependent `curl_memory.h` and `memdebug.h` includes, and delete the now unnecessary headers. - rename `Curl_tcsdup` macro to `curlx_tcsdup` and define like the other allocators. - map `curlx_strdup()` to `_strdup()` on Windows (was: `strdup()`). To fix warnings silenced via `_CRT_NONSTDC_NO_DEPRECATE`. - multibyte: map `curlx_convert_*()` to `_strdup()` on Windows (was: `strdup()`). - src: do not reuse the `strdup` name for the local replacement. - lib509: call `_strdup()` on Windows (was: `strdup()`). - test1132: delete test obsoleted by this patch. - CHECKSRC.md: update text for `SNPRINTF`. - checksrc: ban standard allocator symbols. Follow-up tob12da22db1#18866 Follow-up todb98daab05#18844 Follow-up to4deea9396b#18814 Follow-up to9678ff5b1b#18776 Follow-up to10bac43b87#18774 Follow-up to20142f5d06#18634 Follow-up tobf7375ecc5#18503 Follow-up to9863599d69#18502 Follow-up to3bb5e58c10#17827 Closes #19626
122 lines
3.6 KiB
C
122 lines
3.6 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 "tool_setup.h"
|
|
|
|
#include "tool_cfgable.h"
|
|
#include "tool_msgs.h"
|
|
#include "tool_getparam.h"
|
|
#include "tool_helpers.h"
|
|
|
|
/*
|
|
** Helper functions that are used from more than one source file.
|
|
*/
|
|
|
|
const char *param2text(ParameterError error)
|
|
{
|
|
switch(error) {
|
|
case PARAM_GOT_EXTRA_PARAMETER:
|
|
return "had unsupported trailing garbage";
|
|
case PARAM_OPTION_UNKNOWN:
|
|
return "is unknown";
|
|
case PARAM_REQUIRES_PARAMETER:
|
|
return "requires parameter";
|
|
case PARAM_BAD_USE:
|
|
return "is badly used here";
|
|
case PARAM_BAD_NUMERIC:
|
|
return "expected a proper numerical parameter";
|
|
case PARAM_NEGATIVE_NUMERIC:
|
|
return "expected a positive numerical parameter";
|
|
case PARAM_LIBCURL_DOESNT_SUPPORT:
|
|
return "the installed libcurl version does not support this";
|
|
case PARAM_LIBCURL_UNSUPPORTED_PROTOCOL:
|
|
return "a specified protocol is unsupported by libcurl";
|
|
case PARAM_NO_MEM:
|
|
return "out of memory";
|
|
case PARAM_NO_PREFIX:
|
|
return "the given option cannot be reversed with a --no- prefix";
|
|
case PARAM_NUMBER_TOO_LARGE:
|
|
return "too large number";
|
|
case PARAM_CONTDISP_RESUME_FROM:
|
|
return "--continue-at and --remote-header-name cannot be combined";
|
|
case PARAM_READ_ERROR:
|
|
return "error encountered when reading a file";
|
|
case PARAM_EXPAND_ERROR:
|
|
return "variable expansion failure";
|
|
case PARAM_BLANK_STRING:
|
|
return "blank argument where content is expected";
|
|
case PARAM_VAR_SYNTAX:
|
|
return "syntax error in --variable argument";
|
|
default:
|
|
return "unknown error";
|
|
}
|
|
}
|
|
|
|
int SetHTTPrequest(HttpReq req, HttpReq *store)
|
|
{
|
|
/* this mirrors the HttpReq enum in tool_sdecls.h */
|
|
const char *reqname[]= {
|
|
"", /* unspec */
|
|
"GET (-G, --get)",
|
|
"HEAD (-I, --head)",
|
|
"multipart formpost (-F, --form)",
|
|
"POST (-d, --data)",
|
|
"PUT (-T, --upload-file)"
|
|
};
|
|
|
|
if((*store == TOOL_HTTPREQ_UNSPEC) ||
|
|
(*store == req)) {
|
|
*store = req;
|
|
return 0;
|
|
}
|
|
warnf("You can only select one HTTP request method! "
|
|
"You asked for both %s and %s.",
|
|
reqname[req], reqname[*store]);
|
|
|
|
return 1;
|
|
}
|
|
|
|
void customrequest_helper(HttpReq req, char *method)
|
|
{
|
|
/* this mirrors the HttpReq enum in tool_sdecls.h */
|
|
const char *dflt[]= {
|
|
"GET",
|
|
"GET",
|
|
"HEAD",
|
|
"POST",
|
|
"POST",
|
|
"PUT"
|
|
};
|
|
|
|
if(!method)
|
|
;
|
|
else if(curl_strequal(method, dflt[req])) {
|
|
notef("Unnecessary use of -X or --request, %s is already "
|
|
"inferred.", dflt[req]);
|
|
}
|
|
else if(curl_strequal(method, "head")) {
|
|
warnf("Setting custom HTTP method to HEAD with -X/--request may not work "
|
|
"the way you want. Consider using -I/--head instead.");
|
|
}
|
|
}
|