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 commit ec691ca3 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 commit ec691ca3, 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. Commit ec691ca3 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.
125 lines
3.2 KiB
C
125 lines
3.2 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"
|
|
|
|
#ifdef HAVE_STRINGS_H
|
|
#include <strings.h>
|
|
#endif
|
|
|
|
#include "strequal.h"
|
|
|
|
/*
|
|
* @unittest: 1301
|
|
*/
|
|
int curl_strequal(const char *first, const char *second)
|
|
{
|
|
#if defined(HAVE_STRCASECMP)
|
|
return !(strcasecmp)(first, second);
|
|
#elif defined(HAVE_STRCMPI)
|
|
return !(strcmpi)(first, second);
|
|
#elif defined(HAVE_STRICMP)
|
|
return !(stricmp)(first, second);
|
|
#else
|
|
while(*first && *second) {
|
|
if(toupper(*first) != toupper(*second)) {
|
|
break;
|
|
}
|
|
first++;
|
|
second++;
|
|
}
|
|
return toupper(*first) == toupper(*second);
|
|
#endif
|
|
}
|
|
|
|
/*
|
|
* @unittest: 1301
|
|
*/
|
|
int curl_strnequal(const char *first, const char *second, size_t max)
|
|
{
|
|
#if defined(HAVE_STRNCASECMP)
|
|
return !strncasecmp(first, second, max);
|
|
#elif defined(HAVE_STRNCMPI)
|
|
return !strncmpi(first, second, max);
|
|
#elif defined(HAVE_STRNICMP)
|
|
return !strnicmp(first, second, max);
|
|
#else
|
|
while(*first && *second && max) {
|
|
if(toupper(*first) != toupper(*second)) {
|
|
break;
|
|
}
|
|
max--;
|
|
first++;
|
|
second++;
|
|
}
|
|
if(0 == max)
|
|
return 1; /* they are equal this far */
|
|
|
|
return toupper(*first) == toupper(*second);
|
|
#endif
|
|
}
|
|
|
|
#ifndef HAVE_STRLCAT
|
|
/*
|
|
* The strlcat() function appends the NUL-terminated string src to the end
|
|
* of dst. It will append at most size - strlen(dst) - 1 bytes, NUL-termi-
|
|
* nating the result.
|
|
*
|
|
* The strlcpy() and strlcat() functions return the total length of the
|
|
* string they tried to create. For strlcpy() that means the length of src.
|
|
* For strlcat() that means the initial length of dst plus the length of
|
|
* src. While this may seem somewhat confusing it was done to make trunca-
|
|
* tion detection simple.
|
|
*
|
|
*
|
|
*/
|
|
size_t Curl_strlcat(char *dst, const char *src, size_t siz)
|
|
{
|
|
char *d = dst;
|
|
const char *s = src;
|
|
size_t n = siz;
|
|
union {
|
|
ssize_t sig;
|
|
size_t uns;
|
|
} dlen;
|
|
|
|
/* Find the end of dst and adjust bytes left but don't go past end */
|
|
while(n-- != 0 && *d != '\0')
|
|
d++;
|
|
dlen.sig = d - dst;
|
|
n = siz - dlen.uns;
|
|
|
|
if(n == 0)
|
|
return(dlen.uns + strlen(s));
|
|
while(*s != '\0') {
|
|
if(n != 1) {
|
|
*d++ = *s;
|
|
n--;
|
|
}
|
|
s++;
|
|
}
|
|
*d = '\0';
|
|
|
|
return(dlen.uns + (s - src)); /* count does not include NUL */
|
|
}
|
|
#endif
|