mirror of
https://github.com/curl/curl.git
synced 2026-04-14 22:11:45 +03: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
94 lines
3 KiB
C
94 lines
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"
|
|
|
|
#ifndef HAVE_SELECT
|
|
#error "We cannot compile without select() support."
|
|
#endif
|
|
|
|
#ifdef HAVE_SYS_SELECT_H
|
|
#include <sys/select.h>
|
|
#elif defined(HAVE_UNISTD_H)
|
|
#include <unistd.h>
|
|
#endif
|
|
|
|
#ifdef MSDOS
|
|
#include <dos.h> /* delay() */
|
|
#endif
|
|
|
|
#include "curlx/timediff.h"
|
|
#include "curlx/wait.h"
|
|
|
|
/*
|
|
* Internal function used for waiting a specific amount of ms in
|
|
* Curl_socket_check() and Curl_poll() when no file descriptor is provided to
|
|
* wait on, just being used to delay execution. Winsock select() and poll()
|
|
* timeout mechanisms need a valid socket descriptor in a not null file
|
|
* descriptor set to work. Waiting indefinitely with this function is not
|
|
* allowed, a zero or negative timeout value will return immediately. Timeout
|
|
* resolution, accuracy, as well as maximum supported value is system
|
|
* dependent, neither factor is a critical issue for the intended use of this
|
|
* function in the library.
|
|
*
|
|
* Return values:
|
|
* -1 = system call error, or invalid timeout value
|
|
* 0 = specified timeout has elapsed, or interrupted
|
|
*/
|
|
int curlx_wait_ms(timediff_t timeout_ms)
|
|
{
|
|
int r = 0;
|
|
|
|
if(!timeout_ms)
|
|
return 0;
|
|
if(timeout_ms < 0) {
|
|
SET_SOCKERRNO(SOCKEINVAL);
|
|
return -1;
|
|
}
|
|
#ifdef MSDOS
|
|
delay((unsigned int)timeout_ms);
|
|
#elif defined(_WIN32)
|
|
/* prevent overflow, timeout_ms is typecast to ULONG/DWORD. */
|
|
#if TIMEDIFF_T_MAX >= ULONG_MAX
|
|
if(timeout_ms >= ULONG_MAX)
|
|
timeout_ms = ULONG_MAX - 1;
|
|
/* do not use ULONG_MAX, because that is equal to INFINITE */
|
|
#endif
|
|
Sleep((DWORD)timeout_ms);
|
|
#else
|
|
/* avoid using poll() for this since it behaves incorrectly with no sockets
|
|
on Apple operating systems */
|
|
{
|
|
struct timeval pending_tv;
|
|
r = select(0, NULL, NULL, NULL, curlx_mstotv(&pending_tv, timeout_ms));
|
|
}
|
|
#endif /* _WIN32 */
|
|
if(r) {
|
|
if((r == -1) && (SOCKERRNO == SOCKEINTR))
|
|
/* make EINTR from select or poll not a "lethal" error */
|
|
r = 0;
|
|
else
|
|
r = -1;
|
|
}
|
|
return r;
|
|
}
|