mirror/curl
2
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2024-11-21 01:16:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

moved the Curl_raw_ functions into the new lib/rawstr.c file for easier curlx_

Browse Source 
inclusion by the curl tool without colliding with the curl_strequal functions.
This commit is contained in:
Daniel Stenberg 2008-10-23 11:49:19 +00:00
parent 198fa5e3c7
commit b701ea36a7
23 changed files with 192 additions and 127 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Makefile.inc
View File

@ -9,7 +9,7 @@ CSOURCES = file.c timeval.c base64.c hostip.c progress.c formdata.c \
http_negotiate.c http_ntlm.c inet_pton.c strtoofft.c strerror.c \
hostares.c hostasyn.c hostip4.c hostip6.c hostsyn.c hostthre.c \
inet_ntop.c parsedate.c select.c gtls.c sslgen.c tftp.c splay.c \
strdup.c socks.c ssh.c nss.c qssl.c
strdup.c socks.c ssh.c nss.c qssl.c rawstr.c
HHEADERS = arpa_telnet.h netrc.h file.h timeval.h qssl.h hostip.h \
progress.h formdata.h cookie.h http.h sendf.h ftp.h url.h dict.h \
@ -20,4 +20,4 @@ HHEADERS = arpa_telnet.h netrc.h file.h timeval.h qssl.h hostip.h \
strtoofft.h strerror.h inet_ntop.h curlx.h memory.h setup.h \
transfer.h select.h easyif.h multiif.h parsedate.h sslgen.h gtls.h \
tftp.h sockaddr.h splay.h strdup.h setup_once.h socks.h ssh.h nssg.h \
curl_base64.h
curl_base64.h rawstr.h

1
lib/cookie.c
View File

@ -96,6 +96,7 @@ Example set of cookies:
#include "memory.h"
#include "share.h"
#include "strtoofft.h"
#include "rawstr.h"
/* The last #include file should be: */
#ifdef CURLDEBUG

3
lib/dict.c
View File

@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
* Copyright (C) 1998 - 2007, Daniel Stenberg, <daniel@haxx.se>, et al.
* Copyright (C) 1998 - 2008, 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
@ -74,6 +74,7 @@
#include "progress.h"
#include "strequal.h"
#include "dict.h"
#include "rawstr.h"
#define _MPRINTF_REPLACE /* use our functions only */
#include <curl/mprintf.h>

2
lib/hash.c
View File

@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
* Copyright (C) 1998 - 2007, Daniel Stenberg, <daniel@haxx.se>, et al.
* Copyright (C) 1998 - 2008, 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

1
lib/http.c
View File

@ -96,6 +96,7 @@
#include "parsedate.h" /* for the week day and month names */
#include "strtoofft.h"
#include "multiif.h"
#include "rawstr.h"
#define _MPRINTF_REPLACE /* use our functions only */
#include <curl/mprintf.h>

2
lib/http_digest.c
View File

@ -32,7 +32,7 @@
#include "urldata.h"
#include "sendf.h"
#include "strequal.h"
#include "rawstr.h"
#include "curl_base64.h"
#include "curl_md5.h"
#include "http_digest.h"

2
lib/http_negotiate.c
View File

@ -37,7 +37,7 @@
#include "urldata.h"
#include "sendf.h"
#include "strequal.h"
#include "rawstr.h"
#include "curl_base64.h"
#include "http_negotiate.h"
#include "memory.h"

2
lib/http_ntlm.c
View File

@ -55,7 +55,7 @@
#include "urldata.h"
#include "easyif.h" /* for Curl_convert_... prototypes */
#include "sendf.h"
#include "strequal.h"
#include "rawstr.h"
#include "curl_base64.h"
#include "http_ntlm.h"
#include "url.h"

1
lib/ldap.c
View File

@ -75,6 +75,7 @@
#include "curl_ldap.h"
#include "memory.h"
#include "curl_base64.h"
#include "rawstr.h"
#define _MPRINTF_REPLACE /* use our functions only */
#include <curl/mprintf.h>

1
lib/netrc.c
View File

@ -43,6 +43,7 @@
#include "strequal.h"
#include "strtok.h"
#include "memory.h"
#include "rawstr.h"
#define _MPRINTF_REPLACE /* use our functions only */
#include <curl/mprintf.h>

2
lib/parsedate.c
View File

@ -83,7 +83,7 @@
#endif
#include <curl/curl.h>
#include "strequal.h"
#include "rawstr.h"
#include "parsedate.h"
const char * const Curl_wkday[] =

128
lib/rawstr.c Normal file
View File

@ -0,0 +1,128 @@
/***************************************************************************
* _ _ ____ _
* Project ___| | | | _ \| |
* / __| | | | |_) | |
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
* Copyright (C) 1998 - 2008, 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.
*
* $Id$
***************************************************************************/
#include "setup.h"
#include "rawstr.h"
/* Portable toupper (remember EBCDIC). Do not use tupper() because
its behavior is altered by the current locale. */
static unsigned char my_toupper(unsigned char in)
{
switch (in) {
case 'a':
return 'A';
case 'b':
return 'B';
case 'c':
return 'C';
case 'd':
return 'D';
case 'e':
return 'E';
case 'f':
return 'F';
case 'g':
return 'G';
case 'h':
return 'H';
case 'i':
return 'I';
case 'j':
return 'J';
case 'k':
return 'K';
case 'l':
return 'L';
case 'm':
return 'M';
case 'n':
return 'N';
case 'o':
return 'O';
case 'p':
return 'P';
case 'q':
return 'Q';
case 'r':
return 'R';
case 's':
return 'S';
case 't':
return 'T';
case 'u':
return 'U';
case 'v':
return 'V';
case 'w':
return 'W';
case 'x':
return 'X';
case 'y':
return 'Y';
case 'z':
return 'Z';
}
return in;
}
/*
* Curl_raw_equal() is for doing "raw" case insensitive strings. This is meant
* to be locale independent and only compare strings we know are safe for
* this. See http://daniel.haxx.se/blog/2008/10/15/strcasecmp-in-turkish/ for
* some further explanation to why this function is necessary.
*
* The function is capable of comparing a-z case insensitively even for non-ascii.
*/
int Curl_raw_equal(const char *first, const char *second)
{
while(*first && *second) {
if(my_toupper(*first) != my_toupper(*second))
/* get out of the loop as soon as they don't match */
break;
first++;
second++;
}
/* we do the comparison here (possibly again), just to make sure that if the
loop above is skipped because one of the strings reached zero, we must not
return this as a successful match */
return (my_toupper(*first) == my_toupper(*second));
}
int Curl_raw_nequal(const char *first, const char *second, size_t max)
{
while(*first && *second && max) {
if(my_toupper(*first) != my_toupper(*second)) {
break;
}
max--;
first++;
second++;
}
if(0 == max)
return 1; /* they are equal this far */
return my_toupper(*first) == my_toupper(*second);
}

42
lib/rawstr.h Normal file
View File

@ -0,0 +1,42 @@
#ifndef __RAWSTR_H
#define __RAWSTR_H
/***************************************************************************
* _ _ ____ _
* Project ___| | | | _ \| |
* / __| | | | |_) | |
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
* Copyright (C) 1998 - 2008, 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.
*
* $Id$
***************************************************************************/
#include <curl/curl.h>
/*
* Curl_raw_equal() is for doing "raw" case insensitive strings. This is meant
* to be locale independent and only compare strings we know are safe for
* this.
*
* The function is capable of comparing a-z case insensitively even for non-ascii.
*/
int Curl_raw_equal(const char *first, const char *second);
int Curl_raw_nequal(const char *first, const char *second, size_t max);
/* checkprefix() is a shorter version of the above, used when the first
argument is zero-byte terminated */
#define checkprefix(a,b) Curl_raw_nequal(a,b,strlen(a))
#endif

2
lib/security.c
View File

@ -66,7 +66,7 @@
#include "sendf.h"
#include "ftp.h"
#include "memory.h"
#include "strequal.h"
#include "rawstr.h"
/* The last #include file should be: */
#include "memdebug.h"

4
lib/sslgen.c
View File

@ -57,7 +57,7 @@
#include "nssg.h" /* NSS versions */
#include "qssl.h" /* QSOSSL versions */
#include "sendf.h"
#include "strequal.h"
#include "rawstr.h"
#include "url.h"
#include "memory.h"
#include "progress.h"
@ -68,7 +68,7 @@ static bool safe_strequal(char* str1, char* str2)
{
if(str1 && str2)
/* both pointers point to something then compare them */
return (bool)(0 != strequal(str1, str2));
return (bool)(0 != Curl_raw_equal(str1, str2));
else
/* if both pointers are NULL then treat them as equal */
return (bool)(!str1 && !str2);

1
lib/ssluse.c
View File

@ -50,6 +50,7 @@
#include "strequal.h"
#include "select.h"
#include "sslgen.h"
#include "rawstr.h"
#define _MPRINTF_REPLACE /* use the internal *printf() functions */
#include <curl/mprintf.h>

101
lib/strequal.c
View File

@ -76,107 +76,6 @@ int curl_strnequal(const char *first, const char *second, size_t max)
#endif
}
/* Portable toupper (remember EBCDIC). Do not use tupper() because
its behavior is altered by the current locale. */
static unsigned char my_toupper(unsigned char in)
{
switch (in) {
case 'a':
return 'A';
case 'b':
return 'B';
case 'c':
return 'C';
case 'd':
return 'D';
case 'e':
return 'E';
case 'f':
return 'F';
case 'g':
return 'G';
case 'h':
return 'H';
case 'i':
return 'I';
case 'j':
return 'J';
case 'k':
return 'K';
case 'l':
return 'L';
case 'm':
return 'M';
case 'n':
return 'N';
case 'o':
return 'O';
case 'p':
return 'P';
case 'q':
return 'Q';
case 'r':
return 'R';
case 's':
return 'S';
case 't':
return 'T';
case 'u':
return 'U';
case 'v':
return 'V';
case 'w':
return 'W';
case 'x':
return 'X';
case 'y':
return 'Y';
case 'z':
return 'Z';
}
return in;
}
/*
* Curl_raw_equal() is for doing "raw" case insensitive strings. This is meant
* to be locale independent and only compare strings we know are safe for
* this. See http://daniel.haxx.se/blog/2008/10/15/strcasecmp-in-turkish/ for
* some further explanation to why this function is necessary.
*
* The function is capable of comparing a-z case insensitively even for non-ascii.
*/
int Curl_raw_equal(const char *first, const char *second)
{
while(*first && *second) {
if(my_toupper(*first) != my_toupper(*second))
/* get out of the loop as soon as they don't match */
break;
first++;
second++;
}
/* we do the comparison here (possibly again), just to make sure that if the
loop above is skipped because one of the strings reached zero, we must not
return this as a successful match */
return (my_toupper(*first) == my_toupper(*second));
}
int Curl_raw_nequal(const char *first, const char *second, size_t max)
{
while(*first && *second && max) {
if(my_toupper(*first) != my_toupper(*second)) {
break;
}
max--;
first++;
second++;
}
if(0 == max)
return 1; /* they are equal this far */
return my_toupper(*first) == my_toupper(*second);
}
#ifndef HAVE_STRLCAT
/*
* The strlcat() function appends the NUL-terminated string src to the end

14
lib/strequal.h
View File

@ -28,20 +28,6 @@
#define strequal(a,b) curl_strequal(a,b)
#define strnequal(a,b,c) curl_strnequal(a,b,c)
/*
* Curl_raw_equal() is for doing "raw" case insensitive strings. This is meant
* to be locale independent and only compare strings we know are safe for
* this.
*
* The function is capable of comparing a-z case insensitively even for non-ascii.
*/
int Curl_raw_equal(const char *first, const char *second);
int Curl_raw_nequal(const char *first, const char *second, size_t max);
/* checkprefix() is a shorter version of the above, used when the first
argument is zero-byte terminated */
#define checkprefix(a,b) Curl_raw_nequal(a,b,strlen(a))
#ifndef HAVE_STRLCAT
#define strlcat(x,y,z) Curl_strlcat(x,y,z)
#endif

1
lib/telnet.c
View File

@ -77,6 +77,7 @@
#include "memory.h"
#include "select.h"
#include "strequal.h"
#include "rawstr.h"
/* The last #include file should be: */
#include "memdebug.h"

1
lib/transfer.c
View File

@ -33,6 +33,7 @@
#include "strtoofft.h"
#include "strequal.h"
#include "rawstr.h"
#ifdef WIN32
#include <time.h>

1
lib/url.c
View File

@ -115,6 +115,7 @@ void idn_free (void *ptr); /* prototype from idn-free.h, not provided by
#include "multiif.h"
#include "easyif.h"
#include "speedcheck.h"
#include "rawstr.h"
/* And now for the protocols */
#include "ftp.h"

2
src/Makefile.inc
View File

@ -4,7 +4,7 @@
# the official API, but we re-use the code here to avoid duplication.
CURLX_ONES = $(top_srcdir)/lib/strtoofft.c \
$(top_srcdir)/lib/strdup.c \
$(top_srcdir)/lib/strequal.c
$(top_srcdir)/lib/rawstr.c
CURL_SOURCES = main.c hugehelp.c urlglob.c writeout.c writeenv.c \
getpass.c homedir.c curlutil.c

1
src/main.c
View File

@ -44,6 +44,7 @@
#ifdef USE_ENVIRONMENT
#include "writeenv.h"
#endif
#include "rawstr.h"
#define CURLseparator "--_curl_--"