projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rely on e_os.h to appropriately define str[n]casecmp in non-POSIX
[openssl.git]
/
crypto
/
o_str.c
diff --git
a/crypto/o_str.c
b/crypto/o_str.c
index 5a78f3250977adbb2ef50a1b6e4679c1dcaba96f..da8860491d69a5223ddee8d85a95ca06ad2ee98d 100644
(file)
--- a/
crypto/o_str.c
+++ b/
crypto/o_str.c
@@
-60,12
+60,9
@@
#include <e_os.h>
#include "o_str.h"
#include <e_os.h>
#include "o_str.h"
-#undef strncasecmp
-#undef strcasecmp
-
int OPENSSL_strncasecmp(const char *str1, const char *str2, size_t n)
{
int OPENSSL_strncasecmp(const char *str1, const char *str2, size_t n)
{
-#if defined(OPENSSL_
SYS_VMS
)
+#if defined(OPENSSL_
IMPLEMENTS_strncasecmp
)
while (*str1 && *str2 && n)
{
int res = toupper(*str1) - toupper(*str2);
while (*str1 && *str2 && n)
{
int res = toupper(*str1) - toupper(*str2);
@@
-81,18
+78,17
@@
int OPENSSL_strncasecmp(const char *str1, const char *str2, size_t n)
if (*str2)
return -1;
return 0;
if (*str2)
return -1;
return 0;
-#elif defined(OPENSSL_SYS_WINDOWS)
- return _strnicmp(str1, str2, n);
#else
#else
+ /* Recursion hazard warning! Whenever strncasecmp is #defined as
+ * OPENSSL_strncasecmp, OPENSSL_IMPLEMENTS_strncasecmp must be
+ * defined as well. */
return strncasecmp(str1, str2, n);
#endif
}
int OPENSSL_strcasecmp(const char *str1, const char *str2)
{
return strncasecmp(str1, str2, n);
#endif
}
int OPENSSL_strcasecmp(const char *str1, const char *str2)
{
-#if defined(OPENSSL_
SYS_VMS
)
+#if defined(OPENSSL_
IMPLEMENTS_strncasecmp
)
return OPENSSL_strncasecmp(str1, str2, (size_t)-1);
return OPENSSL_strncasecmp(str1, str2, (size_t)-1);
-#elif defined(OPENSSL_SYS_WINDOWS)
- return _stricmp(str1, str2);
#else
return strcasecmp(str1, str2);
#endif
#else
return strcasecmp(str1, str2);
#endif