mirror of
https://github.com/curl/curl.git
synced 2026-04-15 01:11:40 +03:00
4e051ff550
Clone a multibye conversion function into curlx/fopen, and use that local copy from curlx/fopen functions. Adjust allocators in curlx/fopen to use curl's in normal builds, and system allocators in TrackMemory builds to avoid recursion. This allows to switch curlx/multibyte functions to curl allocators in all configurations, as they are no longer called by curlx/fopen, and a recursive call can no longer happen. After this patch the system allocator is only used in TrackMemory Windows builds, within curlx `fopen`, `freopen`, `stat` and `open` functions. Also: - test 1, 440, 767: raise allocation limitsto fit the extra allocations in Windows Unicode builds. - replace all uses of `curlx_unicodefree()` macro with `curlx_free()` across the codebase. - curlx/multibyte: delete `curlx_unicodefree()`. - ldap: join Windows and non-Windows codepaths that became identical after moving from `curlx_unicodefree()` to `curlx_free()`. - vauth: drop a strdup from standard to curl allocator since the original allocation is now already done by curl's. - tool_doswin: drop now superfluous strdup from `FindWin32CACert()`. - memanalyzer.pm: sync weirdo `calloc` log message with `malloc`'s. Fixes #19748 Closes #19845
73 lines
2.6 KiB
C
73 lines
2.6 KiB
C
#ifndef HEADER_CURL_MULTIBYTE_H
|
|
#define HEADER_CURL_MULTIBYTE_H
|
|
/***************************************************************************
|
|
* _ _ ____ _
|
|
* 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 _WIN32
|
|
|
|
/*
|
|
* Macros curlx_convert_UTF8_to_tchar(), curlx_convert_tchar_to_UTF8()
|
|
* main purpose is to minimize the number of preprocessor conditional
|
|
* directives needed by code using these to differentiate Unicode from
|
|
* non-Unicode builds.
|
|
*
|
|
* In the case of a non-Unicode build the tchar strings are char strings that
|
|
* are duplicated via strdup and remain in whatever the passed in encoding is,
|
|
* which is assumed to be UTF-8 but may be other encoding. Therefore the
|
|
* significance of the conversion functions is primarily for Unicode builds.
|
|
*/
|
|
|
|
#ifdef UNICODE
|
|
|
|
/* MultiByte conversions using Windows kernel32 library. */
|
|
wchar_t *curlx_convert_UTF8_to_wchar(const char *str_utf8);
|
|
char *curlx_convert_wchar_to_UTF8(const wchar_t *str_w);
|
|
|
|
#define curlx_convert_UTF8_to_tchar(ptr) curlx_convert_UTF8_to_wchar((ptr))
|
|
#define curlx_convert_tchar_to_UTF8(ptr) curlx_convert_wchar_to_UTF8((ptr))
|
|
|
|
typedef union {
|
|
unsigned short *tchar_ptr;
|
|
const unsigned short *const_tchar_ptr;
|
|
unsigned short *tbyte_ptr;
|
|
const unsigned short *const_tbyte_ptr;
|
|
} xcharp_u;
|
|
|
|
#else /* !UNICODE */
|
|
|
|
#define curlx_convert_UTF8_to_tchar(ptr) curlx_strdup(ptr)
|
|
#define curlx_convert_tchar_to_UTF8(ptr) curlx_strdup(ptr)
|
|
|
|
typedef union {
|
|
char *tchar_ptr;
|
|
const char *const_tchar_ptr;
|
|
unsigned char *tbyte_ptr;
|
|
const unsigned char *const_tbyte_ptr;
|
|
} xcharp_u;
|
|
|
|
#endif /* UNICODE */
|
|
#endif /* _WIN32 */
|
|
|
|
#endif /* HEADER_CURL_MULTIBYTE_H */
|