mirror of
https://github.com/curl/curl.git
synced 2024-11-21 01:16:58 +08:00
e9a7d4a1c8
Windows compilers define `_WIN32` automatically. Windows SDK headers or build env defines `WIN32`, or we have to take care of it. The agreement seems to be that `_WIN32` is the preferred practice here. Make the source code rely on that to detect we're building for Windows. Public `curl.h` was using `WIN32`, `__WIN32__` and `CURL_WIN32` for Windows detection, next to the official `_WIN32`. After this patch it only uses `_WIN32` for this. Also, make it stop defining `CURL_WIN32`. There is a slight chance these break compatibility with Windows compilers that fail to define `_WIN32`. I'm not aware of any obsolete or modern compiler affected, but in case there is one, one possible solution is to define this macro manually. grepping for `WIN32` remains useful to discover Windows-specific code. Also: - extend `checksrc` to ensure we're not using `WIN32` anymore. - apply minor formatting here and there. - delete unnecessary checks for `!MSDOS` when `_WIN32` is present. Co-authored-by: Jay Satiro Reviewed-by: Daniel Stenberg Closes #12376
81 lines
2.3 KiB
C
81 lines
2.3 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 "curl_setup.h"
|
|
|
|
#include <curl/curl.h>
|
|
#include "curl_memory.h"
|
|
|
|
#include "memdebug.h"
|
|
|
|
static char *GetEnv(const char *variable)
|
|
{
|
|
#if defined(_WIN32_WCE) || defined(CURL_WINDOWS_APP) || \
|
|
defined(__ORBIS__) || defined(__PROSPERO__) /* PlayStation 4 and 5 */
|
|
(void)variable;
|
|
return NULL;
|
|
#elif defined(_WIN32)
|
|
/* This uses Windows API instead of C runtime getenv() to get the environment
|
|
variable since some changes aren't always visible to the latter. #4774 */
|
|
char *buf = NULL;
|
|
char *tmp;
|
|
DWORD bufsize;
|
|
DWORD rc = 1;
|
|
const DWORD max = 32768; /* max env var size from MSCRT source */
|
|
|
|
for(;;) {
|
|
tmp = realloc(buf, rc);
|
|
if(!tmp) {
|
|
free(buf);
|
|
return NULL;
|
|
}
|
|
|
|
buf = tmp;
|
|
bufsize = rc;
|
|
|
|
/* It's possible for rc to be 0 if the variable was found but empty.
|
|
Since getenv doesn't make that distinction we ignore it as well. */
|
|
rc = GetEnvironmentVariableA(variable, buf, bufsize);
|
|
if(!rc || rc == bufsize || rc > max) {
|
|
free(buf);
|
|
return NULL;
|
|
}
|
|
|
|
/* if rc < bufsize then rc is bytes written not including null */
|
|
if(rc < bufsize)
|
|
return buf;
|
|
|
|
/* else rc is bytes needed, try again */
|
|
}
|
|
#else
|
|
char *env = getenv(variable);
|
|
return (env && env[0])?strdup(env):NULL;
|
|
#endif
|
|
}
|
|
|
|
char *curl_getenv(const char *v)
|
|
{
|
|
return GetEnv(v);
|
|
}
|