`Makefile.mk` supported MS-DOS and Amiga, but `./configure` also
supported them in a better tested and more flexible way.
This patch also adds CMake support for MS-DOS/DJGPP and Amiga OS 3.
`Makefile.mk` was not maintained. Delete it in favour of first-tier
build methods.
Also include some non-MS-DOS/AmigaOS-specific tidy-up, see details at
the end of this message.
Details:
- fix/silence all MS-DOS/DJGPP build warnings and issues.
- add MS-DOS support to cmake.
- default to `ENABLE_THREADED_RESOLVER=OFF` for MS-DOS.
- add support for `WATT_ROOT`.
- use static libcurl with MS-DOS.
- fixup default CMake suffixes/prefixes for DJGPP.
- disable hidden symbols for MS-DOS. Not supported on MS-DOS.
- opt-in MS-DOS into `USE_UNIX_SOCKETS`.
- improve MS-DOS support in autotools.
- default to `--disable-threaded-resolver` for MS-DOS.
- make sure to use `close_s()` (from Watt-32) with autotools and cmake.
`Makefile.mk` used it before this patch.
- GHA: add DJGPP cmake (~30s) and autotools (~60s) build jobs.
Also build tests and examples with cmake.
- improve AmigaOS support in autotools:
- configure: detect `CloseSocket()` when it's a macro.
- configure: fix `IoctlSocket` detection on AmigaOS.
- curl-amissl.m4: pass AmiSSL libs to tests/servers.
- add AmigaOS3 support to cmake:
- cmake: fix `HAVE_IOCTLSOCKET_CAMEL` and
`HAVE_IOCTLSOCKET_CAMEL_FIONBIO` detections.
- set necessary system libs.
- add AmiSSL support.
- inet_ntop, inet_pton: fix using it for AmigaOS. cmake detects them,
and they did not compile with AmigaOS.
- cmake: better sync `gethostname` detection with autotools.
Fixes detection for AmigaOS, where `gethostname` is a macro.
- cmake: fix `sys/utime.h` detection on AmigaOS.
- cmake: force-disable `getaddrinfo` for AmigaOS.
- cmake: tweak threading and static/shared default for AmigaOS.
- cmake: rely on manual variable `AMIGA` to enable the platform.
- GHA: add AmigaOS cmake and autotools (~45s) jobs.
Also build tests and examples with cmake.
- INSTALL: update MS-DOS and AmigaOS build instructions.
- amigaos: fix `-Wpointer-sign` and
`zero or negative size array '_args'` in `Printf()`.
- amigaos: fix `-Wpointer-sign`
- amigaos: fix `-Wredundant-decls` `errno` and `h_errno`.
- amigaos: brute-force silence `lseek()` size warnings.
- amigaos: server/resolve: silence `-Wdiscarded-qualifiers`.
- amigaos: server/resolve: fix `-Wpointer-sign`.
- amigaos: fix `CURL_SA_FAMILY_T` type.
- nonblock: prefer `HAVE_IOCTLSOCKET_CAMEL_FIONBIO` for AmigaOS.
`ioctl` is also detected, but fails when used. Make the above override
it for a successful build.
Authored-by: Darren Banfi
Fixes #15537
Closes #15603
- tftpd: prefer `HAVE_IOCTLSOCKET_CAMEL_FIONBIO` for AmigaOS.
- tftpd: tidy-up conditional code.
- curl: set stack size to 16384 for AmigaOS3/4
Overriding the default 4096.
Suggested-by: Darren Banfi
Ref: https://github.com/curl/curl/pull/15543#issuecomment-2498783123
Ref: https://wiki.amigaos.net/wiki/Controlling_Application_Stack
- functypes.h: fix `SEND_QUAL_ARG2` for AmigaOS.
- tftp: add missing cast in sendto() call for AmigaOS.
- getinfo: fix warning with AmigaOS.
- tool_operate: silence warning with AmigaOS
- amigaos: fix building libtests due to missing `RLIMIT_NOFILE`.
- curl_gethostname: silence warning for AmigaOS.
- ftp: silence `-Wtype-limits` for AmigaOS.
- libtest: fix timeval initialization for AmigaOS.
- examples: fix `timeval` initialization for AmigaOS.
- examples: silence warning for AmigaOS.
- configure: fix IPv6 detection for cross-builds.
- netrc: fix to build with AmigaOS cleanly.
- buildinfo: detect and add `DOS` tag for MS-DOS builds.
- buildinfo: add `AMIGA` to buildinfo.txt in auttools.
- build: move `USE_WATT32` macro definition to cmake/configure.
Non-MS-DOS/AmigeOS-specific tidy-ups:
- configure: sync `sa_family_t` detection with cmake.
- configure: sync `ADDRESS_FAMILY` detection signals with cmake.
- doh: use `CURL_SA_FAMILY_T`.
- lib: drop mingw-specific `CURL_SA_FAMILY_T` workaround.
- cmake: extend instead of override check-specific
configurations/requirements.
This allows to honor global requirements added earlier.
Necessary for AmigaOS for example.
- cmake: omit warning on disabled IPv6 for MS-DOS and AmigaOS.
No IPv6 support on these platforms. Also sync with autotools.
- lib1960: use libcurl `inet_pton()` wrapper.
- cmake: detect LibreSSL (to match autotools).
- cmake: say the specific OpenSSL flavour detected.
- hostip: add missing `HAVE_SOCKADDR_IN6_SIN6_SCOPE_ID` guard.
- lib: simplify classic mac feature guards.
Follow-up to a8861b6ccd #9764
Closes #15543
131 lines
3.8 KiB
C
131 lines
3.8 KiB
C
/***************************************************************************
|
|
* _ _ ____ _
|
|
* 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.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.
|
|
*
|
|
* SPDX-License-Identifier: curl
|
|
*
|
|
***************************************************************************/
|
|
#include "test.h"
|
|
|
|
#include "inet_pton.h"
|
|
#include "memdebug.h"
|
|
|
|
/* to prevent libcurl from closing our socket */
|
|
static int closesocket_cb(void *clientp, curl_socket_t item)
|
|
{
|
|
(void)clientp;
|
|
(void)item;
|
|
return 0;
|
|
}
|
|
|
|
/* provide our own socket */
|
|
static curl_socket_t socket_cb(void *clientp,
|
|
curlsocktype purpose,
|
|
struct curl_sockaddr *address)
|
|
{
|
|
int s = *(int *)clientp;
|
|
(void)purpose;
|
|
(void)address;
|
|
return (curl_socket_t)s;
|
|
}
|
|
|
|
/* tell libcurl the socket is connected */
|
|
static int sockopt_cb(void *clientp,
|
|
curl_socket_t curlfd,
|
|
curlsocktype purpose)
|
|
{
|
|
(void)clientp;
|
|
(void)curlfd;
|
|
(void)purpose;
|
|
return CURL_SOCKOPT_ALREADY_CONNECTED;
|
|
}
|
|
|
|
/* Expected args: URL IP PORT */
|
|
CURLcode test(char *URL)
|
|
{
|
|
CURL *curl = NULL;
|
|
CURLcode res = TEST_ERR_MAJOR_BAD;
|
|
int status;
|
|
curl_socket_t client_fd = CURL_SOCKET_BAD;
|
|
struct sockaddr_in serv_addr;
|
|
unsigned short port;
|
|
|
|
if(!strcmp("check", URL))
|
|
return CURLE_OK; /* no output makes it not skipped */
|
|
|
|
port = (unsigned short)atoi(libtest_arg3);
|
|
|
|
if(curl_global_init(CURL_GLOBAL_ALL) != CURLE_OK) {
|
|
fprintf(stderr, "curl_global_init() failed\n");
|
|
return TEST_ERR_MAJOR_BAD;
|
|
}
|
|
|
|
/*
|
|
* This code connects to the TCP port "manually" so that we then can hand
|
|
* over this socket as "already connected" to libcurl and make sure that
|
|
* this works.
|
|
*/
|
|
client_fd = socket(AF_INET, SOCK_STREAM, 0);
|
|
if(client_fd == CURL_SOCKET_BAD) {
|
|
fprintf(stderr, "socket creation error\n");
|
|
goto test_cleanup;
|
|
}
|
|
|
|
serv_addr.sin_family = AF_INET;
|
|
serv_addr.sin_port = htons(port);
|
|
|
|
if(Curl_inet_pton(AF_INET, libtest_arg2, &serv_addr.sin_addr) <= 0) {
|
|
fprintf(stderr, "inet_pton failed\n");
|
|
goto test_cleanup;
|
|
}
|
|
|
|
status = connect(client_fd, (struct sockaddr*)&serv_addr, sizeof(serv_addr));
|
|
if(status < 0) {
|
|
fprintf(stderr, "connection failed\n");
|
|
goto test_cleanup;
|
|
}
|
|
|
|
curl = curl_easy_init();
|
|
if(!curl) {
|
|
fprintf(stderr, "curl_easy_init() failed\n");
|
|
goto test_cleanup;
|
|
}
|
|
|
|
test_setopt(curl, CURLOPT_VERBOSE, 1L);
|
|
test_setopt(curl, CURLOPT_OPENSOCKETFUNCTION, socket_cb);
|
|
test_setopt(curl, CURLOPT_OPENSOCKETDATA, &client_fd);
|
|
test_setopt(curl, CURLOPT_SOCKOPTFUNCTION, sockopt_cb);
|
|
test_setopt(curl, CURLOPT_SOCKOPTDATA, NULL);
|
|
test_setopt(curl, CURLOPT_CLOSESOCKETFUNCTION, closesocket_cb);
|
|
test_setopt(curl, CURLOPT_CLOSESOCKETDATA, NULL);
|
|
test_setopt(curl, CURLOPT_VERBOSE, 1L);
|
|
test_setopt(curl, CURLOPT_HEADER, 1L);
|
|
test_setopt(curl, CURLOPT_URL, URL);
|
|
|
|
res = curl_easy_perform(curl);
|
|
|
|
test_cleanup:
|
|
if(client_fd != CURL_SOCKET_BAD)
|
|
sclose(client_fd);
|
|
curl_easy_cleanup(curl);
|
|
curl_global_cleanup();
|
|
|
|
return res;
|
|
}
|