`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
186 lines
5.2 KiB
C
186 lines
5.2 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.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
|
|
*
|
|
***************************************************************************/
|
|
/* <DESC>
|
|
* Demonstrate curl_easy_send() and curl_easy_recv() usage.
|
|
* </DESC>
|
|
*/
|
|
|
|
#include <stdio.h>
|
|
#include <string.h>
|
|
#include <curl/curl.h>
|
|
|
|
/* Auxiliary function that waits on the socket. */
|
|
static int wait_on_socket(curl_socket_t sockfd, int for_recv, long timeout_ms)
|
|
{
|
|
struct timeval tv;
|
|
fd_set infd, outfd, errfd;
|
|
int res;
|
|
|
|
#if defined(MSDOS) || defined(__AMIGA__)
|
|
tv.tv_sec = (time_t)(timeout_ms / 1000);
|
|
tv.tv_usec = (time_t)(timeout_ms % 1000) * 1000;
|
|
#else
|
|
tv.tv_sec = timeout_ms / 1000;
|
|
tv.tv_usec = (int)(timeout_ms % 1000) * 1000;
|
|
#endif
|
|
|
|
FD_ZERO(&infd);
|
|
FD_ZERO(&outfd);
|
|
FD_ZERO(&errfd);
|
|
|
|
/* Avoid this warning with pre-2020 Cygwin/MSYS releases:
|
|
* warning: conversion to 'long unsigned int' from 'curl_socket_t' {aka 'int'}
|
|
* may change the sign of the result [-Wsign-conversion]
|
|
*/
|
|
#if defined(__GNUC__)
|
|
#pragma GCC diagnostic push
|
|
#pragma GCC diagnostic ignored "-Wsign-conversion"
|
|
#if defined(__DJGPP__)
|
|
#pragma GCC diagnostic ignored "-Warith-conversion"
|
|
#endif
|
|
#elif defined(_MSC_VER)
|
|
#pragma warning(push)
|
|
#pragma warning(disable:4127) /* conditional expression is constant */
|
|
#endif
|
|
FD_SET(sockfd, &errfd); /* always check for error */
|
|
|
|
if(for_recv) {
|
|
FD_SET(sockfd, &infd);
|
|
}
|
|
else {
|
|
FD_SET(sockfd, &outfd);
|
|
}
|
|
#if defined(__GNUC__)
|
|
#pragma GCC diagnostic pop
|
|
#elif defined(_MSC_VER)
|
|
#pragma warning(pop)
|
|
#endif
|
|
|
|
/* select() returns the number of signalled sockets or -1 */
|
|
res = select((int)sockfd + 1, &infd, &outfd, &errfd, &tv);
|
|
return res;
|
|
}
|
|
|
|
int main(void)
|
|
{
|
|
CURL *curl;
|
|
/* Minimalistic http request */
|
|
const char *request = "GET / HTTP/1.0\r\nHost: example.com\r\n\r\n";
|
|
size_t request_len = strlen(request);
|
|
|
|
/* A general note of caution here: if you are using curl_easy_recv() or
|
|
curl_easy_send() to implement HTTP or _any_ other protocol libcurl
|
|
supports "natively", you are doing it wrong and you should stop.
|
|
|
|
This example uses HTTP only to show how to use this API, it does not
|
|
suggest that writing an application doing this is sensible.
|
|
*/
|
|
|
|
curl = curl_easy_init();
|
|
if(curl) {
|
|
CURLcode res;
|
|
curl_socket_t sockfd;
|
|
size_t nsent_total = 0;
|
|
|
|
curl_easy_setopt(curl, CURLOPT_URL, "https://example.com");
|
|
/* Do not do the transfer - only connect to host */
|
|
curl_easy_setopt(curl, CURLOPT_CONNECT_ONLY, 1L);
|
|
res = curl_easy_perform(curl);
|
|
|
|
if(res != CURLE_OK) {
|
|
printf("Error: %s\n", curl_easy_strerror(res));
|
|
return 1;
|
|
}
|
|
|
|
/* Extract the socket from the curl handle - we need it for waiting. */
|
|
res = curl_easy_getinfo(curl, CURLINFO_ACTIVESOCKET, &sockfd);
|
|
|
|
if(res != CURLE_OK) {
|
|
printf("Error: %s\n", curl_easy_strerror(res));
|
|
return 1;
|
|
}
|
|
|
|
printf("Sending request.\n");
|
|
|
|
do {
|
|
/* Warning: This example program may loop indefinitely.
|
|
* A production-quality program must define a timeout and exit this loop
|
|
* as soon as the timeout has expired. */
|
|
size_t nsent;
|
|
do {
|
|
nsent = 0;
|
|
res = curl_easy_send(curl, request + nsent_total,
|
|
request_len - nsent_total, &nsent);
|
|
nsent_total += nsent;
|
|
|
|
if(res == CURLE_AGAIN && !wait_on_socket(sockfd, 0, 60000L)) {
|
|
printf("Error: timeout.\n");
|
|
return 1;
|
|
}
|
|
} while(res == CURLE_AGAIN);
|
|
|
|
if(res != CURLE_OK) {
|
|
printf("Error: %s\n", curl_easy_strerror(res));
|
|
return 1;
|
|
}
|
|
|
|
printf("Sent %lu bytes.\n", (unsigned long)nsent);
|
|
|
|
} while(nsent_total < request_len);
|
|
|
|
printf("Reading response.\n");
|
|
|
|
for(;;) {
|
|
/* Warning: This example program may loop indefinitely (see above). */
|
|
char buf[1024];
|
|
size_t nread;
|
|
do {
|
|
nread = 0;
|
|
res = curl_easy_recv(curl, buf, sizeof(buf), &nread);
|
|
|
|
if(res == CURLE_AGAIN && !wait_on_socket(sockfd, 1, 60000L)) {
|
|
printf("Error: timeout.\n");
|
|
return 1;
|
|
}
|
|
} while(res == CURLE_AGAIN);
|
|
|
|
if(res != CURLE_OK) {
|
|
printf("Error: %s\n", curl_easy_strerror(res));
|
|
break;
|
|
}
|
|
|
|
if(nread == 0) {
|
|
/* end of the response */
|
|
break;
|
|
}
|
|
|
|
printf("Received %lu bytes.\n", (unsigned long)nread);
|
|
}
|
|
|
|
/* always cleanup */
|
|
curl_easy_cleanup(curl);
|
|
}
|
|
return 0;
|
|
}
|