mirror of
https://github.com/moparisthebest/curl
synced 2024-11-10 03:25:04 -05:00
5a053ffe80
This commit renames lib/setup.h to lib/curl_setup.h and
renames lib/setup_once.h to lib/curl_setup_once.h.
Removes the need and usage of a header inclusion guard foreign
to libcurl. [1]
Removes the need and presence of an alarming notice we carried
in old setup_once.h [2]
----------------------------------------
1 - lib/setup_once.h used __SETUP_ONCE_H macro as header inclusion guard
up to commit ec691ca3 which changed this to HEADER_CURL_SETUP_ONCE_H,
this single inclusion guard is enough to ensure that inclusion of
lib/setup_once.h done from lib/setup.h is only done once.
Additionally lib/setup.h has always used __SETUP_ONCE_H macro to
protect inclusion of setup_once.h even after commit ec691ca3, this
was to avoid a circular header inclusion triggered when building a
c-ares enabled version with c-ares sources available which also has
a setup_once.h header. Commit ec691ca3 exposes the real nature of
__SETUP_ONCE_H usage in lib/setup.h, it is a header inclusion guard
foreign to libcurl belonging to c-ares's setup_once.h
The renaming this commit does, fixes the circular header inclusion,
and as such removes the need and usage of a header inclusion guard
foreign to libcurl. Macro __SETUP_ONCE_H no longer used in libcurl.
2 - Due to the circular interdependency of old lib/setup_once.h and the
c-ares setup_once.h header, old file lib/setup_once.h has carried
back from 2006 up to now days an alarming and prominent notice about
the need of keeping libcurl's and c-ares's setup_once.h in sync.
Given that this commit fixes the circular interdependency, the need
and presence of mentioned notice is removed.
All mentioned interdependencies come back from now old days when
the c-ares project lived inside a curl subdirectory. This commit
removes last traces of such fact.
86 lines
2.5 KiB
C
86 lines
2.5 KiB
C
/***************************************************************************
|
|
* _ _ ____ _
|
|
* Project ___| | | | _ \| |
|
|
* / __| | | | |_) | |
|
|
* | (__| |_| | _ <| |___
|
|
* \___|\___/|_| \_\_____|
|
|
*
|
|
* Copyright (C) 1998 - 2012, 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 http://curl.haxx.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.
|
|
*
|
|
***************************************************************************/
|
|
|
|
/*
|
|
* IDN conversions using Windows kernel32 and normaliz libraries.
|
|
*/
|
|
|
|
#include "curl_setup.h"
|
|
|
|
#ifdef USE_WIN32_IDN
|
|
|
|
#include "curl_multibyte.h"
|
|
|
|
#include "curl_memory.h"
|
|
/* The last #include file should be: */
|
|
#include "memdebug.h"
|
|
|
|
#ifdef WANT_IDN_PROTOTYPES
|
|
WINBASEAPI int WINAPI IdnToAscii(DWORD, const WCHAR *, int, WCHAR *, int);
|
|
WINBASEAPI int WINAPI IdnToUnicode(DWORD, const WCHAR *, int, WCHAR *, int);
|
|
#endif
|
|
|
|
#define IDN_MAX_LENGTH 255
|
|
|
|
int curl_win32_idn_to_ascii(const char *in, char **out);
|
|
int curl_win32_ascii_to_idn(const char *in, size_t in_len, char **out_utf8);
|
|
|
|
int curl_win32_idn_to_ascii(const char *in, char **out)
|
|
{
|
|
wchar_t *in_w = Curl_convert_UTF8_to_wchar(in);
|
|
if(in_w) {
|
|
wchar_t punycode[IDN_MAX_LENGTH];
|
|
if(IdnToAscii(0, in_w, -1, punycode, IDN_MAX_LENGTH) == 0) {
|
|
wprintf(L"ERROR %d converting to Punycode\n", GetLastError());
|
|
free(in_w);
|
|
return 0;
|
|
}
|
|
free(in_w);
|
|
|
|
*out = Curl_convert_wchar_to_UTF8(punycode);
|
|
if(!*out)
|
|
return 0;
|
|
}
|
|
return 1;
|
|
}
|
|
|
|
int curl_win32_ascii_to_idn(const char *in, size_t in_len, char **out_utf8)
|
|
{
|
|
(void)in_len; /* unused */
|
|
if(in) {
|
|
WCHAR unicode[IDN_MAX_LENGTH];
|
|
|
|
if(IdnToUnicode(0, (wchar_t *)in, -1, unicode, IDN_MAX_LENGTH) == 0) {
|
|
wprintf(L"ERROR %d converting to Punycode\n", GetLastError());
|
|
return 0;
|
|
}
|
|
else {
|
|
*out_utf8 = Curl_convert_wchar_to_UTF8(unicode);
|
|
if(!*out_utf8)
|
|
return 0;
|
|
}
|
|
}
|
|
return 1;
|
|
}
|
|
|
|
#endif /* USE_WIN32_IDN */
|