mirror of
https://github.com/curl/curl.git
synced 2026-04-12 12:21:42 +08:00
3058ed3df8
Backtrack on previous change that aimed to solve the wrong `share.h` being included. It turns out it did not fix this issue. At the same time it introduced relative header filenames and the need to include the same headers differently depending on the source files' location, reducing readability and editability. Replace this method by re-adding curl's lib source directory to the header path and addressing headers by the their full, relative name to that base directory. Aligning with this method already used in src and tests. With these advantages: - makes includes easier to read, recognize, grep, sort, write, and copy between sources, - syncs the way these headers are included across curl components, - avoids the ambiguity between system `schannel.h`, `rustls.h` vs. local headers using the same names in `lib/vtls`, - silences clang-tidy `readability-duplicate-include` checker, which detects the above issue, Ref: https://clang.llvm.org/extra/clang-tidy/checks/readability/duplicate-include.html - possibly silences TIOBE coding standard warnings: `6.10.2.a: Don't use relative paths in #include statements.` - long shot: it works well with concatenated test sources, for clang-tidy-friendly custom unity builds. Ref: #20667 Slight downside: it's not enforced. If there happens to be a collision between a local `lib/*.h` header and a system one, the solution is to rename (possibly with its `.c` counterpart) into the `curl_` namespace. This is also the method used by curl in the past. Also: - curlx/inet_pton: reduce scope of an include. - toolx/tool_time: apply this to an include, and update VS project files accordingly. Also dropping unnecessary lib/curlx header path. - clang-tidy: enable `readability-duplicate-include`. Follow-up to3887069c66#19676 Follow-up to625f2c1644#16991 #16949 Closes #20623
88 lines
3.4 KiB
C
88 lines
3.4 KiB
C
#ifndef HEADER_CURLX_FOPEN_H
|
|
#define HEADER_CURLX_FOPEN_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 "curl_setup.h"
|
|
|
|
#include "curlx/multibyte.h"
|
|
|
|
#ifdef HAVE_FCNTL_H
|
|
#include <fcntl.h> /* for open() and attributes */
|
|
#endif
|
|
|
|
int curlx_fseek(void *stream, curl_off_t offset, int whence);
|
|
|
|
#ifdef _WIN32
|
|
#include <sys/stat.h> /* for _fstati64(), struct _stati64 */
|
|
#ifndef CURL_WINDOWS_UWP
|
|
HANDLE curlx_CreateFile(const char *filename,
|
|
DWORD dwDesiredAccess,
|
|
DWORD dwShareMode,
|
|
LPSECURITY_ATTRIBUTES lpSecurityAttributes,
|
|
DWORD dwCreationDisposition,
|
|
DWORD dwFlagsAndAttributes,
|
|
HANDLE hTemplateFile);
|
|
#endif /* !CURL_WINDOWS_UWP */
|
|
#define curlx_fstat _fstati64
|
|
#define curlx_struct_stat struct _stati64
|
|
FILE *curlx_win32_fopen(const char *filename, const char *mode);
|
|
FILE *curlx_win32_freopen(const char *filename, const char *mode, FILE *fh);
|
|
int curlx_win32_stat(const char *path, curlx_struct_stat *buffer);
|
|
int curlx_win32_open(const char *filename, int oflag, ...);
|
|
int curlx_win32_rename(const char *oldpath, const char *newpath);
|
|
#define CURLX_FOPEN_LOW curlx_win32_fopen
|
|
#define CURLX_FREOPEN_LOW curlx_win32_freopen
|
|
#define CURLX_FDOPEN_LOW _fdopen
|
|
#define curlx_stat curlx_win32_stat
|
|
#define curlx_open curlx_win32_open
|
|
#define curlx_close _close
|
|
#define curlx_rename curlx_win32_rename
|
|
#else
|
|
#define curlx_fstat fstat
|
|
#define curlx_struct_stat struct stat
|
|
#define CURLX_FOPEN_LOW fopen
|
|
#define CURLX_FREOPEN_LOW freopen
|
|
#define CURLX_FDOPEN_LOW fdopen
|
|
#define curlx_stat stat
|
|
#define curlx_open open
|
|
#define curlx_close close
|
|
#define curlx_rename rename
|
|
#endif
|
|
|
|
#ifdef CURL_MEMDEBUG
|
|
#define curlx_fopen(file, mode) curl_dbg_fopen(file, mode, __LINE__, __FILE__)
|
|
#define curlx_freopen(file, mode, fh) \
|
|
curl_dbg_freopen(file, mode, fh, __LINE__, __FILE__)
|
|
#define curlx_fdopen(file, mode) \
|
|
curl_dbg_fdopen(file, mode, __LINE__, __FILE__)
|
|
#define curlx_fclose(file) curl_dbg_fclose(file, __LINE__, __FILE__)
|
|
#else
|
|
#define curlx_fopen CURLX_FOPEN_LOW
|
|
#define curlx_freopen CURLX_FREOPEN_LOW
|
|
#define curlx_fdopen CURLX_FDOPEN_LOW
|
|
#define curlx_fclose fclose
|
|
#endif
|
|
|
|
#endif /* HEADER_CURLX_FOPEN_H */
|