mirrors/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-04-21 12:05:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

LibC: Avoid generating calls to__cxa_guard_* functions in netdb.cpp

Browse source 
g++ seems to generate calls to __cxa_guard_* functions when we use
non-trivial initialization of local statics.
Requiring these symbols breaks some ports since these symbols are
defined in libcstdc++ which we do not link against when building ports.

This commit turns some local statics into global statics in netdb.cpp so
libc wouldn't need these symbols.
This commit is contained in:
Itamar 2020-09-06 20:12:20 +03:00 • committed by Andreas Kling
parent c5b0e0b96b
commit 542f665b27
Notes: sideshowbarker 2024-07-19 02:52:18 +09:00
1 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
Libraries/LibC/netdb.cpp
View file

@ -95,15 +95,15 @@ static int connect_to_lookup_server()
return fd;
}
static String gethostbyname_name_buffer;
hostent* gethostbyname(const char* name)
{
static String s_name_buffer;
auto ipv4_address = IPv4Address::from_string(name);
if (ipv4_address.has_value()) {
s_name_buffer = ipv4_address.value().to_string();
__gethostbyname_buffer.h_name = const_cast<char*>(s_name_buffer.characters());
gethostbyname_name_buffer = ipv4_address.value().to_string();
__gethostbyname_buffer.h_name = const_cast<char*>(gethostbyname_name_buffer.characters());
__gethostbyname_buffer.h_aliases = nullptr;
__gethostbyname_buffer.h_addrtype = AF_INET;
new (&__gethostbyname_address) IPv4Address(ipv4_address.value());
@ -152,8 +152,8 @@ hostent* gethostbyname(const char* name)
if (rc <= 0)
return nullptr;
s_name_buffer = name;
__gethostbyname_buffer.h_name = const_cast<char*>(s_name_buffer.characters());
gethostbyname_name_buffer = name;
__gethostbyname_buffer.h_name = const_cast<char*>(gethostbyname_name_buffer.characters());
__gethostbyname_buffer.h_aliases = nullptr;
__gethostbyname_buffer.h_addrtype = AF_INET;
__gethostbyname_address_list_buffer[0] = &__gethostbyname_address;
@ -164,9 +164,10 @@ hostent* gethostbyname(const char* name)
return &__gethostbyname_buffer;
}
static String gethostbyaddr_name_buffer;
hostent* gethostbyaddr(const void* addr, socklen_t addr_size, int type)
{
static String s_name_buffer;
if (type != AF_INET) {
errno = EAFNOSUPPORT;
@ -215,8 +216,8 @@ hostent* gethostbyaddr(const void* addr, socklen_t addr_size, int type)
if (responses.is_empty())
return nullptr;
s_name_buffer = responses[0];
__gethostbyaddr_buffer.h_name = const_cast<char*>(s_name_buffer.characters());
gethostbyaddr_name_buffer = responses[0];
__gethostbyaddr_buffer.h_name = const_cast<char*>(gethostbyaddr_name_buffer.characters());
__gethostbyaddr_buffer.h_aliases = nullptr;
__gethostbyaddr_buffer.h_addrtype = AF_INET;
// FIXME: Should we populate the hostent's address list here with a sockaddr_in for the provided host?