wbrawner/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rely on e_os.h to appropriately define str[n]casecmp in non-POSIX

Browse source 
environments.
This commit is contained in:
Andy Polyakov 2005-01-14 16:22:02 +00:00
parent adeb20b6b7
commit ea28f93c2d
2 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
crypto/o_str.c
View file

@ -60,12 +60,9 @@
#include <e_os.h> #include <e_os.h>
#include "o_str.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) while (*str1 && *str2 && n)
{ {
int res = toupper(*str1) - toupper(*str2); int res = toupper(*str1) - toupper(*str2);
@ -81,18 +78,17 @@ int OPENSSL_strncasecmp(const char *str1, const char *str2, size_t n)
if (*str2) if (*str2)
return -1; return -1;
return 0; 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); return strncasecmp(str1, str2, n);
#endif #endif
} }
int OPENSSL_strcasecmp(const char *str1, const char *str2) 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 #else
return strcasecmp(str1, str2); return strcasecmp(str1, str2);
#endif #endif

1
e_os.h
View file

@ -518,6 +518,7 @@ extern char *sys_errlist[]; extern int sys_nerr;
# include "o_str.h" # include "o_str.h"
# define strcasecmp OPENSSL_strcasecmp # define strcasecmp OPENSSL_strcasecmp
# define strncasecmp OPENSSL_strncasecmp # define strncasecmp OPENSSL_strncasecmp
# define OPENSSL_IMPLEMENTS_strncasecmp
#elif defined(OPENSSL_SYS_OS2) && defined(__EMX__) #elif defined(OPENSSL_SYS_OS2) && defined(__EMX__)
# define strcasecmp stricmp # define strcasecmp stricmp
# define strncasecmp strnicmp # define strncasecmp strnicmp