The-Homebrew-Cloud/libcurlwrapper
2
0
Fork 0
mirror of https://github.com/wiiu-env/libcurlwrapper.git synced 2024-11-27 07:04:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Build with libcurl/8.0.1, update Dockerfile

Browse Source
This commit is contained in:
Maschell 2023-07-15 11:09:34 +02:00
parent e3c1d93078
commit 38209a1671
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@ -1,4 +1,4 @@
FROM ghcr.io/wiiu-env/devkitppc:20230326 FROM ghcr.io/wiiu-env/devkitppc:20230621
WORKDIR tmp_build WORKDIR tmp_build
COPY . . COPY . .

2
Dockerfile.buildlocal
View File

@ -1,3 +1,3 @@
FROM ghcr.io/wiiu-env/devkitppc:20230326 FROM ghcr.io/wiiu-env/devkitppc:20230621
WORKDIR project WORKDIR project

11
source/main.cpp
View File

@ -42,9 +42,10 @@ extern "C" int curl_global_init() {
char *(*s_curl_version_tmp)() = nullptr; char *(*s_curl_version_tmp)() = nullptr;
if (OSDynLoad_FindExport(sModuleHandle, OS_DYNLOAD_EXPORT_FUNC, "curl_version", (void **) &s_curl_version_tmp) == OS_DYNLOAD_OK) { if (OSDynLoad_FindExport(sModuleHandle, OS_DYNLOAD_EXPORT_FUNC, "curl_version", (void **) &s_curl_version_tmp) == OS_DYNLOAD_OK) {
const char *expectedCURLVersion = "libcurl/7.84.0"; const char *expectedCURLVersion1 = "libcurl/7.84.0";
if (!std::string_view(s_curl_version_tmp()).starts_with(expectedCURLVersion)) { const char *expectedCURLVersion2 = "libcurl/8.0.1";
DEBUG_FUNCTION_LINE_WARN("Unexpected libcurl version: %s (expected %s)", s_curl_version_tmp(), expectedCURLVersion); if (!std::string_view(s_curl_version_tmp()).starts_with(expectedCURLVersion1) && !std::string_view(s_curl_version_tmp()).starts_with(expectedCURLVersion2)) {
DEBUG_FUNCTION_LINE_WARN("Unexpected libcurl version: %s (expected %s)", s_curl_version_tmp(), expectedCURLVersion2);
} }
} else { } else {
DEBUG_FUNCTION_LINE_WARN("Failed to check curl_version"); DEBUG_FUNCTION_LINE_WARN("Failed to check curl_version");
@ -65,6 +66,7 @@ extern "C" void curl_global_cleanup() {
for (auto &handle : functionHandles) { for (auto &handle : functionHandles) {
*handle = 0; *handle = 0;
} }
functionHandles.clear();
} }
extern "C" int curlwrapper_setsockopt(int sockfd, int level, int optname, const void *optval, socklen_t optlen) { extern "C" int curlwrapper_setsockopt(int sockfd, int level, int optname, const void *optval, socklen_t optlen) {
@ -219,6 +221,9 @@ MAGIC_FUNCTION(int, curl_mvsprintf, 0, arg1, arg2, arg3);
MAGIC_FUNCTION(int, curl_mvsnprintf, 0, arg1, arg2, arg3, arg4); MAGIC_FUNCTION(int, curl_mvsnprintf, 0, arg1, arg2, arg3, arg4);
MAGIC_FUNCTION(char *, curl_mvaprintf, nullptr, arg1, arg2); MAGIC_FUNCTION(char *, curl_mvaprintf, nullptr, arg1, arg2);
MAGIC_FUNCTION(int, curl_ws_recv, CURLM_INTERNAL_ERROR, arg1, arg2, arg3, arg4, arg5);
MAGIC_FUNCTION(int, curl_ws_send, CURLM_INTERNAL_ERROR, arg1, arg2, arg3, arg4, arg5);
extern "C" int curl_mprintf(const char *format, ...) { extern "C" int curl_mprintf(const char *format, ...) {
va_list va; va_list va;