projects
/
platform
/
upstream
/
curl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add default cipher list for TV
[platform/upstream/curl.git]
/
lib
/
strequal.c
diff --git
a/lib/strequal.c
b/lib/strequal.c
index
d69e536
..
01c3784
100644
(file)
--- a/
lib/strequal.c
+++ b/
lib/strequal.c
@@
-1,58
+1,47
@@
-/***************************************************************************
**
- * _ _ ____ _
- * Project ___| | | | _ \| |
- * / __| | | | |_) | |
- * | (__| |_| | _ <| |___
+/***************************************************************************
+ * _ _ ____ _
+ * Project ___| | | | _ \| |
+ * / __| | | | |_) | |
+ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
* \___|\___/|_| \_\_____|
*
- * The contents of this file are subject to the Mozilla Public License
- * Version 1.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
+ * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
*
*
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
- * License for the specific language governing rights and limitations
- * under the License.
+ * 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.haxx.se/docs/copyright.html.
*
*
- * The Original Code is Curl.
+ * 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.
*
*
- * The Initial Developer of the Original Code is Daniel Stenberg.
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
*
*
- * Portions created by the Initial Developer are Copyright (C) 2000.
- * All Rights Reserved.
- *
- * ------------------------------------------------------------
- * Main author:
- * - Daniel Stenberg <daniel@haxx.se>
- *
- * http://curl.haxx.se
- *
- * $Source$
- * $Revision$
- * $Date$
- * $Author$
- * $State$
- * $Locker$
- *
- * ------------------------------------------------------------
- ****************************************************************************/
+ ***************************************************************************/
+
+#include "curl_setup.h"
-#include <string.h>
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
+#endif
-#include "s
etup
.h"
+#include "s
trequal
.h"
-int strequal(const char *first, const char *second)
+/*
+ * @unittest: 1301
+ */
+int curl_strequal(const char *first, const char *second)
{
#if defined(HAVE_STRCASECMP)
{
#if defined(HAVE_STRCASECMP)
- return !
strcasecmp
(first, second);
+ return !
(strcasecmp)
(first, second);
#elif defined(HAVE_STRCMPI)
#elif defined(HAVE_STRCMPI)
- return !
strcmpi
(first, second);
+ return !
(strcmpi)
(first, second);
#elif defined(HAVE_STRICMP)
#elif defined(HAVE_STRICMP)
- return !
stricmp
(first, second);
+ return !
(stricmp)
(first, second);
#else
#else
- while
(*first && *second) {
- if
(toupper(*first) != toupper(*second)) {
+ while(*first && *second) {
+ if(toupper(*first) != toupper(*second)) {
break;
}
first++;
break;
}
first++;
@@
-62,24
+51,29
@@
int strequal(const char *first, const char *second)
#endif
}
#endif
}
-int strnequal(const char *first, const char *second, size_t max)
+/*
+ * @unittest: 1301
+ */
+int curl_strnequal(const char *first, const char *second, size_t max)
{
{
-#if defined(HAVE_STRCASECMP)
+#if defined(HAVE_STR
N
CASECMP)
return !strncasecmp(first, second, max);
return !strncasecmp(first, second, max);
-#elif defined(HAVE_STRCMPI)
+#elif defined(HAVE_STR
N
CMPI)
return !strncmpi(first, second, max);
return !strncmpi(first, second, max);
-#elif defined(HAVE_STRICMP)
+#elif defined(HAVE_STR
N
ICMP)
return !strnicmp(first, second, max);
#else
return !strnicmp(first, second, max);
#else
- while
(*first && *second && max) {
- if
(toupper(*first) != toupper(*second)) {
+ while(*first && *second && max) {
+ if(toupper(*first) != toupper(*second)) {
break;
}
max--;
first++;
second++;
}
break;
}
max--;
first++;
second++;
}
+ if(0 == max)
+ return 1; /* they are equal this far */
+
return toupper(*first) == toupper(*second);
#endif
}
return toupper(*first) == toupper(*second);
#endif
}
-