Bananymous
/
banan-os
1
1
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: Bananymous:40649c8b46ccff36233d5dcf39c37dacbab93f45
Branches Tags
Bananymous:main
..
compare: Bananymous:107b31a0b51b26a17ff4a7ace56cf60dd559db05
Branches Tags
Bananymous:main

No commits in common. "40649c8b46ccff36233d5dcf39c37dacbab93f45" and "107b31a0b51b26a17ff4a7ace56cf60dd559db05" have entirely different histories.
40649c8b46 ... 107b31a0b5

2 changed files with 3 additions and 66 deletions
Show Stats Expand all files Collapse all files

54
userspace/libraries/LibC/string.cpp
View File

@ -156,12 +156,7 @@ char* strncat(char* __restrict__ dest, const char* __restrict__ src, size_t n)
int strcoll(const char* s1, const char* s2) int strcoll(const char* s1, const char* s2)
{ {
return strcoll_l(s1, s2, __getlocale(LC_COLLATE)); switch (__getlocale(LC_COLLATE))
}
int strcoll_l(const char *s1, const char *s2, locale_t locale)
{
switch (locale)
{ {
case LOCALE_INVALID: case LOCALE_INVALID:
ASSERT_NOT_REACHED(); ASSERT_NOT_REACHED();
@ -367,53 +362,6 @@ char* strtok_r(char* __restrict str, const char* __restrict sep, char** __restri
return str; return str;
} }
size_t strxfrm(char* __restrict s1, const char* __restrict s2, size_t n)
{
return strxfrm_l(s1, s2, n, __getlocale(LC_COLLATE));
}
size_t strxfrm_l(char* __restrict s1, const char* __restrict s2, size_t n, locale_t locale)
{
(void)s1;
(void)s2;
(void)n;
ASSERT_NOT_REACHED();
switch (locale)
{
case LOCALE_INVALID:
ASSERT_NOT_REACHED();
case LOCALE_POSIX:
return strcmp(s1, s2);
case LOCALE_UTF8:
{
const unsigned char* u1 = (unsigned char*)s1;
const unsigned char* u2 = (unsigned char*)s2;
if (!*u1 || !*u2)
return *u1 - *u2;
wchar_t wc1, wc2;
while (*u1 && *u2)
{
wc1 = BAN::UTF8::to_codepoint(u1);
wc2 = BAN::UTF8::to_codepoint(u2);
if (wc1 == (wchar_t)BAN::UTF8::invalid || wc2 == (wchar_t)BAN::UTF8::invalid)
{
errno = EINVAL;
return -1;
}
if (wc1 != wc2)
break;
u1 += BAN::UTF8::byte_length(*u1);
u2 += BAN::UTF8::byte_length(*u2);
}
return wc1 - wc2;
}
}
ASSERT_NOT_REACHED();
}
char* strsignal(int signum) char* strsignal(int signum)
{ {
static char buffer[128]; static char buffer[128];

15
userspace/programs/resolver/main.cpp
View File

@ -127,7 +127,7 @@ BAN::Optional<DNSResponse> read_dns_response(int socket)
DNSAnswer& answer = *reinterpret_cast<DNSAnswer*>(&reply.data[idx]); DNSAnswer& answer = *reinterpret_cast<DNSAnswer*>(&reply.data[idx]);
if (answer.type() != QTYPE::A) if (answer.type() != QTYPE::A)
{ {
dprintln("Not A record, but {}", static_cast<uint16_t>(answer.type())); dprintln("Not A record");
return {}; return {};
} }
if (answer.data_len() != 4) if (answer.data_len() != 4)
@ -197,10 +197,6 @@ int main(int, char**)
{ {
srand(time(nullptr)); srand(time(nullptr));
char hostname[HOST_NAME_MAX];
if (gethostname(hostname, sizeof(hostname)) == -1)
hostname[0] = '\0';
int service_socket = create_service_socket(); int service_socket = create_service_socket();
if (service_socket == -1) if (service_socket == -1)
return 1; return 1;
@ -310,14 +306,7 @@ int main(int, char**)
BAN::Optional<DNSEntry> result; BAN::Optional<DNSEntry> result;
if (*hostname && strcmp(query->data(), hostname) == 0) if (dns_cache.contains(*query))
{
result = DNSEntry {
.valid_until = time(nullptr),
.address = ntohl(INADDR_LOOPBACK),
};
}
else if (dns_cache.contains(*query))
{ {
auto& cached = dns_cache[*query]; auto& cached = dns_cache[*query];
if (time(nullptr) <= cached.valid_until) if (time(nullptr) <= cached.valid_until)