From b701ea36a723b2d7700e23ae53e2c3145dfe7bda Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Thu, 23 Oct 2008 11:49:19 +0000 Subject: [PATCH] moved the Curl_raw_ functions into the new lib/rawstr.c file for easier curlx_ inclusion by the curl tool without colliding with the curl_strequal functions. --- lib/Makefile.inc | 4 +- lib/cookie.c | 1 + lib/dict.c | 3 +- lib/hash.c | 2 +- lib/http.c | 1 + lib/http_digest.c | 2 +- lib/http_negotiate.c | 2 +- lib/http_ntlm.c | 2 +- lib/ldap.c | 1 + lib/netrc.c | 1 + lib/parsedate.c | 2 +- lib/rawstr.c | 128 +++++++++++++++++++++++++++++++++++++++++++ lib/rawstr.h | 42 ++++++++++++++ lib/security.c | 2 +- lib/sslgen.c | 4 +- lib/ssluse.c | 1 + lib/strequal.c | 101 ---------------------------------- lib/strequal.h | 14 ----- lib/telnet.c | 1 + lib/transfer.c | 1 + lib/url.c | 1 + src/Makefile.inc | 2 +- src/main.c | 1 + 23 files changed, 192 insertions(+), 127 deletions(-) create mode 100644 lib/rawstr.c create mode 100644 lib/rawstr.h diff --git a/lib/Makefile.inc b/lib/Makefile.inc index 7be6ccf913..a89e8d9196 100644 --- a/lib/Makefile.inc +++ b/lib/Makefile.inc @@ -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 diff --git a/lib/cookie.c b/lib/cookie.c index fed4a44f60..b117f2f8ba 100644 --- a/lib/cookie.c +++ b/lib/cookie.c @@ -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 diff --git a/lib/dict.c b/lib/dict.c index f9ce50efcf..6bd75f6dc1 100644 --- a/lib/dict.c +++ b/lib/dict.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2007, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2008, Daniel Stenberg, , 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 diff --git a/lib/hash.c b/lib/hash.c index e62a79e03d..3fcb44e4f0 100644 --- a/lib/hash.c +++ b/lib/hash.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2007, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2008, Daniel Stenberg, , et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms diff --git a/lib/http.c b/lib/http.c index 503ceb0c19..068748c3cc 100644 --- a/lib/http.c +++ b/lib/http.c @@ -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 diff --git a/lib/http_digest.c b/lib/http_digest.c index 3ba01a5bca..569c18c8a5 100644 --- a/lib/http_digest.c +++ b/lib/http_digest.c @@ -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" diff --git a/lib/http_negotiate.c b/lib/http_negotiate.c index b3099a24ae..d8fb7a25d1 100644 --- a/lib/http_negotiate.c +++ b/lib/http_negotiate.c @@ -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" diff --git a/lib/http_ntlm.c b/lib/http_ntlm.c index 20a4640e10..afed953e25 100644 --- a/lib/http_ntlm.c +++ b/lib/http_ntlm.c @@ -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" diff --git a/lib/ldap.c b/lib/ldap.c index ba52fa0041..bd35ae8288 100644 --- a/lib/ldap.c +++ b/lib/ldap.c @@ -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 diff --git a/lib/netrc.c b/lib/netrc.c index 83ad077618..221d215068 100644 --- a/lib/netrc.c +++ b/lib/netrc.c @@ -43,6 +43,7 @@ #include "strequal.h" #include "strtok.h" #include "memory.h" +#include "rawstr.h" #define _MPRINTF_REPLACE /* use our functions only */ #include diff --git a/lib/parsedate.c b/lib/parsedate.c index 786ab7ff42..843368cf74 100644 --- a/lib/parsedate.c +++ b/lib/parsedate.c @@ -83,7 +83,7 @@ #endif #include -#include "strequal.h" +#include "rawstr.h" #include "parsedate.h" const char * const Curl_wkday[] = diff --git a/lib/rawstr.c b/lib/rawstr.c new file mode 100644 index 0000000000..b0fe38b269 --- /dev/null +++ b/lib/rawstr.c @@ -0,0 +1,128 @@ +/*************************************************************************** + * _ _ ____ _ + * Project ___| | | | _ \| | + * / __| | | | |_) | | + * | (__| |_| | _ <| |___ + * \___|\___/|_| \_\_____| + * + * Copyright (C) 1998 - 2008, Daniel Stenberg, , 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); +} + diff --git a/lib/rawstr.h b/lib/rawstr.h new file mode 100644 index 0000000000..58eec77270 --- /dev/null +++ b/lib/rawstr.h @@ -0,0 +1,42 @@ +#ifndef __RAWSTR_H +#define __RAWSTR_H +/*************************************************************************** + * _ _ ____ _ + * Project ___| | | | _ \| | + * / __| | | | |_) | | + * | (__| |_| | _ <| |___ + * \___|\___/|_| \_\_____| + * + * Copyright (C) 1998 - 2008, Daniel Stenberg, , 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_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 diff --git a/lib/security.c b/lib/security.c index cc2c917e99..3a9642ae4d 100644 --- a/lib/security.c +++ b/lib/security.c @@ -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" diff --git a/lib/sslgen.c b/lib/sslgen.c index 1bfeda7130..ac6991bdcd 100644 --- a/lib/sslgen.c +++ b/lib/sslgen.c @@ -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); diff --git a/lib/ssluse.c b/lib/ssluse.c index 3f2990cf8c..c7258862ff 100644 --- a/lib/ssluse.c +++ b/lib/ssluse.c @@ -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 diff --git a/lib/strequal.c b/lib/strequal.c index 3d00aa2139..e8c6674970 100644 --- a/lib/strequal.c +++ b/lib/strequal.c @@ -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 diff --git a/lib/strequal.h b/lib/strequal.h index eac4002029..70fd0bbe6e 100644 --- a/lib/strequal.h +++ b/lib/strequal.h @@ -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 diff --git a/lib/telnet.c b/lib/telnet.c index 7e7beb27c1..4d405b621c 100644 --- a/lib/telnet.c +++ b/lib/telnet.c @@ -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" diff --git a/lib/transfer.c b/lib/transfer.c index abd663ff09..80eda3d33e 100644 --- a/lib/transfer.c +++ b/lib/transfer.c @@ -33,6 +33,7 @@ #include "strtoofft.h" #include "strequal.h" +#include "rawstr.h" #ifdef WIN32 #include diff --git a/lib/url.c b/lib/url.c index bf77eab95e..944741709c 100644 --- a/lib/url.c +++ b/lib/url.c @@ -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" diff --git a/src/Makefile.inc b/src/Makefile.inc index 12e67a1e5f..8c0a1f1f73 100644 --- a/src/Makefile.inc +++ b/src/Makefile.inc @@ -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 diff --git a/src/main.c b/src/main.c index 3c248a5810..e12c26ed53 100644 --- a/src/main.c +++ b/src/main.c @@ -44,6 +44,7 @@ #ifdef USE_ENVIRONMENT #include "writeenv.h" #endif +#include "rawstr.h" #define CURLseparator "--_curl_--"