mirror of
https://github.com/moparisthebest/curl
synced 2024-12-23 00:28:48 -05:00
5a053ffe80
This commit renames lib/setup.h to lib/curl_setup.h and renames lib/setup_once.h to lib/curl_setup_once.h. Removes the need and usage of a header inclusion guard foreign to libcurl. [1] Removes the need and presence of an alarming notice we carried in old setup_once.h [2] ---------------------------------------- 1 - lib/setup_once.h used __SETUP_ONCE_H macro as header inclusion guard up to commitec691ca3
which changed this to HEADER_CURL_SETUP_ONCE_H, this single inclusion guard is enough to ensure that inclusion of lib/setup_once.h done from lib/setup.h is only done once. Additionally lib/setup.h has always used __SETUP_ONCE_H macro to protect inclusion of setup_once.h even after commitec691ca3
, this was to avoid a circular header inclusion triggered when building a c-ares enabled version with c-ares sources available which also has a setup_once.h header. Commitec691ca3
exposes the real nature of __SETUP_ONCE_H usage in lib/setup.h, it is a header inclusion guard foreign to libcurl belonging to c-ares's setup_once.h The renaming this commit does, fixes the circular header inclusion, and as such removes the need and usage of a header inclusion guard foreign to libcurl. Macro __SETUP_ONCE_H no longer used in libcurl. 2 - Due to the circular interdependency of old lib/setup_once.h and the c-ares setup_once.h header, old file lib/setup_once.h has carried back from 2006 up to now days an alarming and prominent notice about the need of keeping libcurl's and c-ares's setup_once.h in sync. Given that this commit fixes the circular interdependency, the need and presence of mentioned notice is removed. All mentioned interdependencies come back from now old days when the c-ares project lived inside a curl subdirectory. This commit removes last traces of such fact.
189 lines
4.3 KiB
C
189 lines
4.3 KiB
C
/***************************************************************************
|
|
* _ _ ____ _
|
|
* Project ___| | | | _ \| |
|
|
* / __| | | | |_) | |
|
|
* | (__| |_| | _ <| |___
|
|
* \___|\___/|_| \_\_____|
|
|
*
|
|
* Copyright (C) 1998 - 2011, 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 http://curl.haxx.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.
|
|
*
|
|
***************************************************************************/
|
|
|
|
#include "curl_setup.h"
|
|
|
|
#include "strtoofft.h"
|
|
|
|
/*
|
|
* NOTE:
|
|
*
|
|
* In the ISO C standard (IEEE Std 1003.1), there is a strtoimax() function we
|
|
* could use in case strtoll() doesn't exist... See
|
|
* http://www.opengroup.org/onlinepubs/009695399/functions/strtoimax.html
|
|
*/
|
|
|
|
#ifdef NEED_CURL_STRTOLL
|
|
|
|
/* Range tests can be used for alphanum decoding if characters are consecutive,
|
|
like in ASCII. Else an array is scanned. Determine this condition now. */
|
|
|
|
#if('9' - '0') != 9 || ('Z' - 'A') != 25 || ('z' - 'a') != 25
|
|
|
|
#define NO_RANGE_TEST
|
|
|
|
static const char valchars[] =
|
|
"0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
|
|
#endif
|
|
|
|
static int get_char(char c, int base);
|
|
|
|
/**
|
|
* Emulated version of the strtoll function. This extracts a long long
|
|
* value from the given input string and returns it.
|
|
*/
|
|
curl_off_t
|
|
curlx_strtoll(const char *nptr, char **endptr, int base)
|
|
{
|
|
char *end;
|
|
int is_negative = 0;
|
|
int overflow;
|
|
int i;
|
|
curl_off_t value = 0;
|
|
curl_off_t newval;
|
|
|
|
/* Skip leading whitespace. */
|
|
end = (char *)nptr;
|
|
while(ISSPACE(end[0])) {
|
|
end++;
|
|
}
|
|
|
|
/* Handle the sign, if any. */
|
|
if(end[0] == '-') {
|
|
is_negative = 1;
|
|
end++;
|
|
}
|
|
else if(end[0] == '+') {
|
|
end++;
|
|
}
|
|
else if(end[0] == '\0') {
|
|
/* We had nothing but perhaps some whitespace -- there was no number. */
|
|
if(endptr) {
|
|
*endptr = end;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
/* Handle special beginnings, if present and allowed. */
|
|
if(end[0] == '0' && end[1] == 'x') {
|
|
if(base == 16 || base == 0) {
|
|
end += 2;
|
|
base = 16;
|
|
}
|
|
}
|
|
else if(end[0] == '0') {
|
|
if(base == 8 || base == 0) {
|
|
end++;
|
|
base = 8;
|
|
}
|
|
}
|
|
|
|
/* Matching strtol, if the base is 0 and it doesn't look like
|
|
* the number is octal or hex, we assume it's base 10.
|
|
*/
|
|
if(base == 0) {
|
|
base = 10;
|
|
}
|
|
|
|
/* Loop handling digits. */
|
|
value = 0;
|
|
overflow = 0;
|
|
for(i = get_char(end[0], base);
|
|
i != -1;
|
|
end++, i = get_char(end[0], base)) {
|
|
newval = base * value + i;
|
|
if(newval < value) {
|
|
/* We've overflowed. */
|
|
overflow = 1;
|
|
break;
|
|
}
|
|
else
|
|
value = newval;
|
|
}
|
|
|
|
if(!overflow) {
|
|
if(is_negative) {
|
|
/* Fix the sign. */
|
|
value *= -1;
|
|
}
|
|
}
|
|
else {
|
|
if(is_negative)
|
|
value = CURL_OFF_T_MIN;
|
|
else
|
|
value = CURL_OFF_T_MAX;
|
|
|
|
SET_ERRNO(ERANGE);
|
|
}
|
|
|
|
if(endptr)
|
|
*endptr = end;
|
|
|
|
return value;
|
|
}
|
|
|
|
/**
|
|
* Returns the value of c in the given base, or -1 if c cannot
|
|
* be interpreted properly in that base (i.e., is out of range,
|
|
* is a null, etc.).
|
|
*
|
|
* @param c the character to interpret according to base
|
|
* @param base the base in which to interpret c
|
|
*
|
|
* @return the value of c in base, or -1 if c isn't in range
|
|
*/
|
|
static int get_char(char c, int base)
|
|
{
|
|
#ifndef NO_RANGE_TEST
|
|
int value = -1;
|
|
if(c <= '9' && c >= '0') {
|
|
value = c - '0';
|
|
}
|
|
else if(c <= 'Z' && c >= 'A') {
|
|
value = c - 'A' + 10;
|
|
}
|
|
else if(c <= 'z' && c >= 'a') {
|
|
value = c - 'a' + 10;
|
|
}
|
|
#else
|
|
const char * cp;
|
|
int value;
|
|
|
|
cp = memchr(valchars, c, 10 + 26 + 26);
|
|
|
|
if(!cp)
|
|
return -1;
|
|
|
|
value = cp - valchars;
|
|
|
|
if(value >= 10 + 26)
|
|
value -= 26; /* Lowercase. */
|
|
#endif
|
|
|
|
if(value >= base) {
|
|
value = -1;
|
|
}
|
|
|
|
return value;
|
|
}
|
|
#endif /* Only present if we need strtoll, but don't have it. */
|