`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
156 lines
4.2 KiB
C
156 lines
4.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
|
|
*
|
|
***************************************************************************/
|
|
#include "tool_setup.h"
|
|
|
|
#ifdef HAVE_PWD_H
|
|
#undef __NO_NET_API /* required for AmigaOS to declare getpwuid() */
|
|
#include <pwd.h>
|
|
#define __NO_NET_API
|
|
#endif
|
|
|
|
#ifdef HAVE_SYS_STAT_H
|
|
#include <sys/stat.h>
|
|
#endif
|
|
#ifdef HAVE_FCNTL_H
|
|
#include <fcntl.h>
|
|
#endif
|
|
|
|
#include <curlx.h>
|
|
|
|
#include "tool_findfile.h"
|
|
|
|
#include "memdebug.h" /* keep this as LAST include */
|
|
|
|
struct finder {
|
|
const char *env;
|
|
const char *append;
|
|
bool withoutdot;
|
|
};
|
|
|
|
/* The order of the variables below is important, as the index number is used
|
|
in the findfile() function */
|
|
static const struct finder conf_list[] = {
|
|
{ "CURL_HOME", NULL, FALSE },
|
|
{ "XDG_CONFIG_HOME", NULL, TRUE },
|
|
{ "HOME", NULL, FALSE },
|
|
#ifdef _WIN32
|
|
{ "USERPROFILE", NULL, FALSE },
|
|
{ "APPDATA", NULL, FALSE },
|
|
{ "USERPROFILE", "\\Application Data", FALSE},
|
|
#endif
|
|
/* these are for .curlrc if XDG_CONFIG_HOME is not defined */
|
|
{ "CURL_HOME", "/.config", TRUE },
|
|
{ "HOME", "/.config", TRUE },
|
|
|
|
{ NULL, NULL, FALSE }
|
|
};
|
|
|
|
static char *checkhome(const char *home, const char *fname, bool dotscore)
|
|
{
|
|
const char pref[2] = { '.', '_' };
|
|
int i;
|
|
for(i = 0; i < (dotscore ? 2 : 1); i++) {
|
|
char *c;
|
|
if(dotscore)
|
|
c = aprintf("%s" DIR_CHAR "%c%s", home, pref[i], &fname[1]);
|
|
else
|
|
c = aprintf("%s" DIR_CHAR "%s", home, fname);
|
|
if(c) {
|
|
int fd = open(c, O_RDONLY);
|
|
if(fd >= 0) {
|
|
char *path = strdup(c);
|
|
close(fd);
|
|
curl_free(c);
|
|
return path;
|
|
}
|
|
curl_free(c);
|
|
}
|
|
}
|
|
return NULL;
|
|
}
|
|
|
|
/*
|
|
* findfile() - return the full path name of the file.
|
|
*
|
|
* If 'dotscore' is TRUE, then check for the file first with a leading dot
|
|
* and then with a leading underscore.
|
|
*
|
|
* 1. Iterate over the environment variables in order, and if set, check for
|
|
* the given file to be accessed there, then it is a match.
|
|
* 2. Non-Windows: try getpwuid
|
|
*/
|
|
char *findfile(const char *fname, int dotscore)
|
|
{
|
|
int i;
|
|
DEBUGASSERT(fname && fname[0]);
|
|
DEBUGASSERT((dotscore != 1) || (fname[0] == '.'));
|
|
|
|
if(!fname[0])
|
|
return NULL;
|
|
|
|
for(i = 0; conf_list[i].env; i++) {
|
|
char *home = curl_getenv(conf_list[i].env);
|
|
if(home) {
|
|
char *path;
|
|
const char *filename = fname;
|
|
if(!home[0]) {
|
|
curl_free(home);
|
|
continue;
|
|
}
|
|
if(conf_list[i].append) {
|
|
char *c = aprintf("%s%s", home, conf_list[i].append);
|
|
curl_free(home);
|
|
if(!c)
|
|
return NULL;
|
|
home = c;
|
|
}
|
|
if(conf_list[i].withoutdot) {
|
|
if(!dotscore) {
|
|
/* this is not looking for .curlrc, or the XDG_CONFIG_HOME was
|
|
defined so we skip the extended check */
|
|
curl_free(home);
|
|
continue;
|
|
}
|
|
filename++; /* move past the leading dot */
|
|
dotscore = 0; /* disable it for this check */
|
|
}
|
|
path = checkhome(home, filename, dotscore ? dotscore - 1 : 0);
|
|
curl_free(home);
|
|
if(path)
|
|
return path;
|
|
}
|
|
}
|
|
#if defined(HAVE_GETPWUID) && defined(HAVE_GETEUID)
|
|
{
|
|
struct passwd *pw = getpwuid(geteuid());
|
|
if(pw) {
|
|
char *home = pw->pw_dir;
|
|
if(home && home[0])
|
|
return checkhome(home, fname, FALSE);
|
|
}
|
|
}
|
|
#endif /* PWD-stuff */
|
|
return NULL;
|
|
}
|