mirror of
https://github.com/curl/curl.git
synced 2026-08-02 14:30:28 +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
139 lines
4 KiB
C
139 lines
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 "tool_setup.h"
|
|
|
|
#ifdef _WIN32
|
|
#include <direct.h>
|
|
#endif
|
|
|
|
#include "tool_dirhie.h"
|
|
#include "tool_msgs.h"
|
|
|
|
#if defined(_WIN32) || (defined(MSDOS) && !defined(__DJGPP__))
|
|
# define mkdir(x,y) (mkdir)((x))
|
|
# ifndef F_OK
|
|
# define F_OK 0
|
|
# endif
|
|
#endif
|
|
|
|
static void show_dir_errno(const char *name)
|
|
{
|
|
switch(errno) {
|
|
#ifdef EACCES
|
|
/* !checksrc! disable ERRNOVAR 1 */
|
|
case EACCES:
|
|
errorf("You do not have permission to create %s", name);
|
|
break;
|
|
#endif
|
|
#ifdef ENAMETOOLONG
|
|
case ENAMETOOLONG:
|
|
errorf("The directory name %s is too long", name);
|
|
break;
|
|
#endif
|
|
#ifdef EROFS
|
|
case EROFS:
|
|
errorf("%s resides on a read-only file system", name);
|
|
break;
|
|
#endif
|
|
#ifdef ENOSPC
|
|
case ENOSPC:
|
|
errorf("No space left on the file system that will "
|
|
"contain the directory %s", name);
|
|
break;
|
|
#endif
|
|
#ifdef EDQUOT
|
|
case EDQUOT:
|
|
errorf("Cannot create directory %s because you "
|
|
"exceeded your quota", name);
|
|
break;
|
|
#endif
|
|
default:
|
|
errorf("Error creating directory %s", name);
|
|
break;
|
|
}
|
|
}
|
|
|
|
/*
|
|
* Create the needed directory hierarchy recursively in order to save
|
|
* multi-GETs in file output, ie:
|
|
* curl "http://example.org/dir[1-5]/file[1-5].txt" -o "dir#1/file#2.txt"
|
|
* should create all the dir* automagically
|
|
*/
|
|
|
|
#if defined(_WIN32) || defined(__DJGPP__)
|
|
/* systems that may use either or when specifying a path */
|
|
#define PATH_DELIMITERS "\\/"
|
|
#else
|
|
#define PATH_DELIMITERS DIR_CHAR
|
|
#endif
|
|
|
|
CURLcode create_dir_hierarchy(const char *outfile)
|
|
{
|
|
CURLcode result = CURLE_OK;
|
|
size_t outlen = strlen(outfile);
|
|
struct dynbuf dirbuf;
|
|
|
|
curlx_dyn_init(&dirbuf, outlen + 1);
|
|
|
|
while(*outfile) {
|
|
bool skip = FALSE;
|
|
size_t seplen = strspn(outfile, PATH_DELIMITERS);
|
|
size_t len = strcspn(&outfile[seplen], PATH_DELIMITERS);
|
|
|
|
/* the last path component is the file and it ends with a null byte */
|
|
if(!outfile[len + seplen])
|
|
break;
|
|
|
|
#if defined(_WIN32) || defined(MSDOS)
|
|
if(!curlx_dyn_len(&dirbuf)) {
|
|
/* Skip creating a drive's current directory. It may seem as though that
|
|
would harmlessly fail but it could be a corner case if X: did not
|
|
exist, since we would be creating it erroneously. eg if outfile is
|
|
X:\foo\bar\filename then do not mkdir X: This logic takes into
|
|
account unsupported drives !:, 1:, etc. */
|
|
if(len > 1 && (outfile[1]==':'))
|
|
skip = TRUE;
|
|
}
|
|
#endif
|
|
/* insert the leading separators (possibly plural) plus the following
|
|
directory name */
|
|
result = curlx_dyn_addn(&dirbuf, outfile, seplen + len);
|
|
if(result)
|
|
return result;
|
|
|
|
/* Create directory. Ignore access denied error to allow traversal. */
|
|
/* !checksrc! disable ERRNOVAR 1 */
|
|
if(!skip && (mkdir(curlx_dyn_ptr(&dirbuf), (mode_t)0000750) == -1) &&
|
|
(errno != EACCES) && (errno != EEXIST)) {
|
|
show_dir_errno(curlx_dyn_ptr(&dirbuf));
|
|
result = CURLE_WRITE_ERROR;
|
|
break; /* get out of loop */
|
|
}
|
|
outfile += len + seplen;
|
|
}
|
|
|
|
curlx_dyn_free(&dirbuf);
|
|
|
|
return result;
|
|
}
|