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
73 lines
2.7 KiB
C
73 lines
2.7 KiB
C
#ifndef HEADER_CURL_TOOL_DOSWIN_H
|
|
#define HEADER_CURL_TOOL_DOSWIN_H
|
|
/***************************************************************************
|
|
* _ _ ____ _
|
|
* 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"
|
|
|
|
#if defined(_WIN32) || defined(MSDOS)
|
|
|
|
#define SANITIZE_ALLOW_COLONS (1<<0) /* Allow colons */
|
|
#define SANITIZE_ALLOW_PATH (1<<1) /* Allow path separators and colons */
|
|
#define SANITIZE_ALLOW_RESERVED (1<<2) /* Allow reserved device names */
|
|
#define SANITIZE_ALLOW_TRUNCATE (1<<3) /* Allow truncating a long filename */
|
|
|
|
typedef enum {
|
|
SANITIZE_ERR_OK = 0, /* 0 - OK */
|
|
SANITIZE_ERR_INVALID_PATH, /* 1 - the path is invalid */
|
|
SANITIZE_ERR_BAD_ARGUMENT, /* 2 - bad function parameter */
|
|
SANITIZE_ERR_OUT_OF_MEMORY, /* 3 - out of memory */
|
|
SANITIZE_ERR_LAST /* never use! */
|
|
} SANITIZEcode;
|
|
|
|
SANITIZEcode sanitize_file_name(char **const sanitized, const char *file_name,
|
|
int flags);
|
|
#ifdef UNITTESTS
|
|
SANITIZEcode truncate_dryrun(const char *path, const size_t truncate_pos);
|
|
SANITIZEcode msdosify(char **const sanitized, const char *file_name,
|
|
int flags);
|
|
SANITIZEcode rename_if_reserved_dos_device_name(char **const sanitized,
|
|
const char *file_name,
|
|
int flags);
|
|
#endif /* UNITTESTS */
|
|
|
|
#if defined(MSDOS) && (defined(__DJGPP__) || defined(__GO32__))
|
|
|
|
char **__crt0_glob_function(char *arg);
|
|
|
|
#endif /* MSDOS && (__DJGPP__ || __GO32__) */
|
|
|
|
#ifdef _WIN32
|
|
|
|
CURLcode FindWin32CACert(struct OperationConfig *config,
|
|
curl_sslbackend backend,
|
|
const TCHAR *bundle_file);
|
|
struct curl_slist *GetLoadedModulePaths(void);
|
|
CURLcode win32_init(void);
|
|
|
|
#endif /* _WIN32 */
|
|
|
|
#endif /* _WIN32 || MSDOS */
|
|
|
|
#endif /* HEADER_CURL_TOOL_DOSWIN_H */
|