c04504885d
Sources used `lib/curlx.h` with both `ENABLE_CURLX_PRINTF` set and unset
before including it.
In a cmake "unity" batch where the first included source had it unset,
the next sources did not get the macros requested with
`ENABLE_CURLX_PRINTF` because `lib/curl.x` had already been included
without them.
Fix it by by making the macros enabled permanently and globally for
internal sources, and dropping `ENABLE_CURLX_PRINTF`.
This came up while testing unity builds with smaller batches. The full,
default unity build where all `src` is bundled up in a single unit, was
not affected.
Fixes:
```
$ cmake -B build -DCMAKE_UNITY_BUILD=ON -DCMAKE_UNITY_BUILD_BATCH_SIZE=15
$ make -C build
...
curl/src/tool_getparam.c: In function ‘getparameter’:
curl/src/tool_getparam.c:2409:11: error: implicit declaration of function ‘msnprintf’; did you mean ‘vsnprintf’? [-Wimplicit-function-declaration]
2409 | msnprintf(buffer, sizeof(buffer), "%" CURL_FORMAT_CURL_OFF_T "-",
| ^~~~~~~~~
| vsnprintf
curl/src/tool_getparam.c:2409:11: warning: nested extern declaration of ‘msnprintf’ [-Wnested-externs]
[...]
```
Reported-by: Daniel Stenberg
Bug: https://github.com/curl/curl/pull/14626#issuecomment-2301663491
Closes #14632
91 lines
3.2 KiB
C
91 lines
3.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"
|
|
|
|
#include "curlx.h"
|
|
|
|
#include "tool_cfgable.h"
|
|
#include "tool_operate.h"
|
|
#include "tool_cb_see.h"
|
|
|
|
#include "memdebug.h" /* keep this as LAST include */
|
|
|
|
/* OUR_MAX_SEEK_L has 'long' data type, OUR_MAX_SEEK_O has 'curl_off_t,
|
|
both represent the same value. Maximum offset used here when we lseek
|
|
using a 'long' data type offset */
|
|
|
|
#define OUR_MAX_SEEK_L 2147483647L - 1L
|
|
#define OUR_MAX_SEEK_O CURL_OFF_T_C(0x7FFFFFFF) - CURL_OFF_T_C(0x1)
|
|
|
|
/*
|
|
** callback for CURLOPT_SEEKFUNCTION
|
|
**
|
|
** Notice that this is not supposed to return the resulting offset. This
|
|
** shall only return CURL_SEEKFUNC_* return codes.
|
|
*/
|
|
|
|
int tool_seek_cb(void *userdata, curl_off_t offset, int whence)
|
|
{
|
|
struct per_transfer *per = userdata;
|
|
|
|
#if(SIZEOF_CURL_OFF_T > SIZEOF_OFF_T) && !defined(USE_WIN32_LARGE_FILES)
|
|
|
|
/* The offset check following here is only interesting if curl_off_t is
|
|
larger than off_t and we are not using the Win32 large file support
|
|
macros that provide the support to do 64-bit seeks correctly */
|
|
|
|
if(offset > OUR_MAX_SEEK_O) {
|
|
/* Some precaution code to work around problems with different data sizes
|
|
to allow seeking >32-bit even if off_t is 32-bit. Should be very rare
|
|
and is really valid on weirdo-systems. */
|
|
curl_off_t left = offset;
|
|
|
|
if(whence != SEEK_SET)
|
|
/* this code path does not support other types */
|
|
return CURL_SEEKFUNC_FAIL;
|
|
|
|
if(LSEEK_ERROR == lseek(per->infd, 0, SEEK_SET))
|
|
/* could not rewind to beginning */
|
|
return CURL_SEEKFUNC_FAIL;
|
|
|
|
while(left) {
|
|
long step = (left > OUR_MAX_SEEK_O) ? OUR_MAX_SEEK_L : (long)left;
|
|
if(LSEEK_ERROR == lseek(per->infd, step, SEEK_CUR))
|
|
/* could not seek forwards the desired amount */
|
|
return CURL_SEEKFUNC_FAIL;
|
|
left -= step;
|
|
}
|
|
return CURL_SEEKFUNC_OK;
|
|
}
|
|
#endif
|
|
|
|
if(LSEEK_ERROR == lseek(per->infd, offset, whence))
|
|
/* could not rewind, the reason is in errno but errno is just not portable
|
|
enough and we do not actually care that much why we failed. We will let
|
|
libcurl know that it may try other means if it wants to. */
|
|
return CURL_SEEKFUNC_CANTSEEK;
|
|
|
|
return CURL_SEEKFUNC_OK;
|
|
}
|