mirror of
https://github.com/curl/curl.git
synced 2026-06-22 17:15:38 +03: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
243 lines
6.2 KiB
C
243 lines
6.2 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 "curl_setup.h"
|
|
|
|
#ifdef __AMIGA__
|
|
|
|
#include <curl/curl.h>
|
|
|
|
#include "hostip.h"
|
|
#include "amigaos.h"
|
|
|
|
#ifdef HAVE_PROTO_BSDSOCKET_H
|
|
# if defined(__amigaos4__)
|
|
# include <bsdsocket/socketbasetags.h>
|
|
# elif !defined(USE_AMISSL)
|
|
# include <amitcp/socketbasetags.h>
|
|
# endif
|
|
# ifdef __libnix__
|
|
# include <stabs.h>
|
|
# endif
|
|
#endif
|
|
|
|
#ifdef HAVE_PROTO_BSDSOCKET_H
|
|
|
|
#ifdef __amigaos4__
|
|
/*
|
|
* AmigaOS 4.x specific code
|
|
*/
|
|
|
|
/*
|
|
* hostip4.c - Curl_ipv4_resolve_r() replacement code
|
|
*
|
|
* Logic that needs to be considered are the following build cases:
|
|
* - newlib networking
|
|
* - clib2 networking
|
|
* - direct bsdsocket.library networking (usually AmiSSL builds)
|
|
* Each with the threaded resolver enabled or not.
|
|
*
|
|
* With the threaded resolver enabled, try to use gethostbyname_r() where
|
|
* available, otherwise (re)open bsdsocket.library and fallback to
|
|
* gethostbyname().
|
|
*/
|
|
|
|
#include <proto/bsdsocket.h>
|
|
|
|
static struct SocketIFace *__CurlISocket = NULL;
|
|
static uint32 SocketFeatures = 0;
|
|
|
|
#define HAVE_BSDSOCKET_GETHOSTBYNAME_R 0x01
|
|
#define HAVE_BSDSOCKET_GETADDRINFO 0x02
|
|
|
|
CURLcode Curl_amiga_init(void)
|
|
{
|
|
struct SocketIFace *ISocket;
|
|
struct Library *base = OpenLibrary("bsdsocket.library", 4);
|
|
|
|
if(base) {
|
|
ISocket = (struct SocketIFace *)GetInterface(base, "main", 1, NULL);
|
|
if(ISocket) {
|
|
ULONG enabled = 0;
|
|
|
|
SocketBaseTags(SBTM_SETVAL(SBTC_CAN_SHARE_LIBRARY_BASES), TRUE,
|
|
SBTM_GETREF(SBTC_HAVE_GETHOSTADDR_R_API), (ULONG)&enabled,
|
|
TAG_DONE);
|
|
|
|
if(enabled) {
|
|
SocketFeatures |= HAVE_BSDSOCKET_GETHOSTBYNAME_R;
|
|
}
|
|
|
|
__CurlISocket = ISocket;
|
|
|
|
atexit(Curl_amiga_cleanup);
|
|
|
|
return CURLE_OK;
|
|
}
|
|
CloseLibrary(base);
|
|
}
|
|
|
|
return CURLE_FAILED_INIT;
|
|
}
|
|
|
|
void Curl_amiga_cleanup(void)
|
|
{
|
|
if(__CurlISocket) {
|
|
struct Library *base = __CurlISocket->Data.LibBase;
|
|
DropInterface((struct Interface *)__CurlISocket);
|
|
CloseLibrary(base);
|
|
__CurlISocket = NULL;
|
|
}
|
|
}
|
|
|
|
#ifdef CURLRES_AMIGA
|
|
/*
|
|
* Because we need to handle the different cases in hostip4.c at runtime,
|
|
* not at compile-time, based on what was detected in Curl_amiga_init(),
|
|
* we replace it completely with our own as to not complicate the baseline
|
|
* code. Assumes malloc/calloc/free are thread safe because Curl_he2ai()
|
|
* allocates memory also.
|
|
*/
|
|
|
|
struct Curl_addrinfo *Curl_ipv4_resolve_r(const char *hostname,
|
|
int port)
|
|
{
|
|
struct Curl_addrinfo *ai = NULL;
|
|
struct hostent *h;
|
|
struct SocketIFace *ISocket = __CurlISocket;
|
|
|
|
if(SocketFeatures & HAVE_BSDSOCKET_GETHOSTBYNAME_R) {
|
|
LONG h_errnop = 0;
|
|
struct hostent *buf;
|
|
|
|
buf = curlx_calloc(1, CURL_HOSTENT_SIZE);
|
|
if(buf) {
|
|
h = gethostbyname_r((STRPTR)hostname, buf,
|
|
(char *)buf + sizeof(struct hostent),
|
|
CURL_HOSTENT_SIZE - sizeof(struct hostent),
|
|
&h_errnop);
|
|
if(h) {
|
|
ai = Curl_he2ai(h, port);
|
|
}
|
|
curlx_free(buf);
|
|
}
|
|
}
|
|
else {
|
|
#ifdef CURLRES_THREADED
|
|
/* gethostbyname() is not thread safe, so we need to reopen bsdsocket
|
|
* on the thread's context
|
|
*/
|
|
struct Library *base = OpenLibrary("bsdsocket.library", 4);
|
|
if(base) {
|
|
ISocket = (struct SocketIFace *)GetInterface(base, "main", 1, NULL);
|
|
if(ISocket) {
|
|
h = gethostbyname((STRPTR)hostname);
|
|
if(h) {
|
|
ai = Curl_he2ai(h, port);
|
|
}
|
|
DropInterface((struct Interface *)ISocket);
|
|
}
|
|
CloseLibrary(base);
|
|
}
|
|
#else
|
|
/* not using threaded resolver - safe to use this as-is */
|
|
h = gethostbyname(hostname);
|
|
if(h) {
|
|
ai = Curl_he2ai(h, port);
|
|
}
|
|
#endif
|
|
}
|
|
|
|
return ai;
|
|
}
|
|
#endif /* CURLRES_AMIGA */
|
|
|
|
#ifdef USE_AMISSL
|
|
#include <signal.h>
|
|
int Curl_amiga_select(int nfds, fd_set *readfds, fd_set *writefds,
|
|
fd_set *errorfds, struct timeval *timeout)
|
|
{
|
|
int r = WaitSelect(nfds, readfds, writefds, errorfds, timeout, 0);
|
|
/* Ensure Ctrl-C signal is actioned */
|
|
if((r == -1) && (SOCKERRNO == SOCKEINTR))
|
|
raise(SIGINT);
|
|
return r;
|
|
}
|
|
#endif /* USE_AMISSL */
|
|
|
|
#elif !defined(USE_AMISSL) /* __amigaos4__ */
|
|
/*
|
|
* Amiga OS3 specific code
|
|
*/
|
|
|
|
struct Library *SocketBase = NULL;
|
|
|
|
#ifdef __libnix__
|
|
void __request(const char *msg);
|
|
#define CURL_AMIGA_REQUEST(msg) __request(msg)
|
|
#else
|
|
#define CURL_AMIGA_REQUEST(msg) Printf((const unsigned char *)(msg "\n\a"), 0)
|
|
#endif
|
|
|
|
void Curl_amiga_cleanup(void)
|
|
{
|
|
if(SocketBase) {
|
|
CloseLibrary(SocketBase);
|
|
SocketBase = NULL;
|
|
}
|
|
}
|
|
|
|
CURLcode Curl_amiga_init(void)
|
|
{
|
|
if(!SocketBase)
|
|
SocketBase = OpenLibrary((const unsigned char *)"bsdsocket.library", 4);
|
|
|
|
if(!SocketBase) {
|
|
CURL_AMIGA_REQUEST("No TCP/IP Stack running!");
|
|
return CURLE_FAILED_INIT;
|
|
}
|
|
|
|
if(SocketBaseTags(SBTM_SETVAL(SBTC_ERRNOPTR(sizeof(errno))), (ULONG)&errno,
|
|
SBTM_SETVAL(SBTC_LOGTAGPTR), (ULONG)"curl",
|
|
TAG_DONE)) {
|
|
CURL_AMIGA_REQUEST("SocketBaseTags ERROR");
|
|
return CURLE_FAILED_INIT;
|
|
}
|
|
|
|
#ifndef __libnix__
|
|
atexit(Curl_amiga_cleanup);
|
|
#endif
|
|
|
|
return CURLE_OK;
|
|
}
|
|
|
|
#ifdef __libnix__
|
|
ADD2EXIT(Curl_amiga_cleanup, -50);
|
|
#endif
|
|
|
|
#endif /* !USE_AMISSL */
|
|
|
|
#endif /* HAVE_PROTO_BSDSOCKET_H */
|
|
|
|
#endif /* __AMIGA__ */
|