Remove unnecessary String re-implementations from PAL

Author: rhuanjl

pal/inc/mbusafecrt.h

@@ -64,11 +64,7 @@ extern errno_t wcsncpy_s( WCHAR* outDest, size_t inDestBufferSize, const WCHAR*
 extern char* strtok_s( char* inString, const char* inControl, char** ioContext );
 extern WCHAR* wcstok_s( WCHAR* inString, const WCHAR* inControl, WCHAR** ioContext );
 
-// strnlen is not required unless the source string is completely untrusted (e.g. anonymous input on a website)
-#ifndef SUPPRESS_STRNLEN
-    extern size_t strnlen( const char* inString, size_t inMaxSize );
-    extern size_t wcsnlen( const WCHAR* inString, size_t inMaxSize );
-#endif
+extern size_t wcsnlen( const WCHAR* inString, size_t inMaxSize );
 
 extern errno_t _itoa_s( int inValue, char* outBuffer, size_t inDestBufferSize, int inRadix );
 extern errno_t _itow_s( int inValue, WCHAR* outBuffer, size_t inDestBufferSize, int inRadix );

pal/inc/pal.h

@@ -45,6 +45,7 @@ Module Name:
 #include <stdlib.h>
 #include <stdarg.h>
 #include <string.h>
+#include <strings.h>
 #include <errno.h>
 #include <ctype.h>
 #endif
@@ -6103,7 +6104,6 @@ CoCreateGuid(OUT GUID * pguid);
 #define vswprintf     PAL_vswprintf
 #define fopen         PAL_fopen
 #define strtok        PAL_strtok
-#define strtoul       PAL_strtoul
 #define fprintf       PAL_fprintf
 #define fwprintf      PAL_fwprintf
 #define vfprintf      PAL_vfprintf
@@ -6137,7 +6137,6 @@ CoCreateGuid(OUT GUID * pguid);
 #define mkstemp       PAL_mkstemp
 #define rename        PAL_rename
 #define unlink        PAL_unlink
-#define _strdup       PAL__strdup
 #define _getcwd       PAL__getcwd
 #define _open         PAL__open
 #define _close        PAL__close
@@ -6180,7 +6179,6 @@ PALIMPORT void * __cdecl memchr(const void *, int, size_t);
 PALIMPORT size_t __cdecl strlen(const char *);
 PALIMPORT int __cdecl strcmp(const char*, const char *);
 PALIMPORT int __cdecl strncmp(const char*, const char *, size_t);
-PALIMPORT int __cdecl _strnicmp(const char *, const char *, size_t);
 PALIMPORT char * __cdecl strcat(char *, const char *);
 PALIMPORT char * __cdecl strncat(char *, const char *, size_t);
 PALIMPORT char * __cdecl strcpy(char *, const char *);
@@ -6198,7 +6196,7 @@ PALIMPORT int __cdecl sscanf(const char *, const char *, ...);
 PALIMPORT int __cdecl atoi(const char *);
 PALIMPORT LONG __cdecl atol(const char *);
 //PALIMPORT long long int __cdecl atoll(const char *) __THROW;
-PALIMPORT ULONG __cdecl strtoul(const char *, char **, int);
+PALIMPORT unsigned long __cdecl strtoul(const char *, char **, int);
 PALIMPORT double __cdecl atof(const char *);
 PALIMPORT double __cdecl strtod(const char *, char **);
 PALIMPORT int __cdecl isprint(int);
@@ -6218,7 +6216,7 @@ PALIMPORT errno_t __cdecl memcpy_s(void *, size_t, const void *, size_t);
 PALIMPORT errno_t __cdecl memmove_s(void *, size_t, const void *, size_t);
 PALIMPORT void * __cdecl memmove_xplat(void *, const void *, size_t);
 PALIMPORT char * __cdecl _strlwr(char *);
-PALIMPORT int __cdecl _stricmp(const char *, const char *);
+PALIMPORT int __cdecl strcasecmp(const char *, const char *);
 PALIMPORT int __cdecl _snprintf(char *, size_t, const char *, ...);
 PALIMPORT char * __cdecl _gcvt_s(char *, int, double, int);
 PALIMPORT char * __cdecl _ecvt(double, int, int *, int *);

pal/inc/rt/safecrt.h

@@ -2409,34 +2409,11 @@ unsigned char * __cdecl _mbstok_s(unsigned char *_String, const unsigned char *_
 #endif /* _SAFECRT_DEFINE_MBS_FUNCTIONS */
 
 #ifndef PAL_STDCPP_COMPAT
-/* strnlen */
 /*
- * strnlen, wcsnlen ;
+ *  wcsnlen ;
  * returns inMaxSize if the null character is not found.
  */
-_SAFECRT__EXTERN_C
-size_t __cdecl strnlen(const char* inString, size_t inMaxSize);
-
-#if _SAFECRT_USE_INLINES || _SAFECRT_IMPL
-
-_SAFECRT__INLINE
-size_t __cdecl strnlen(const char* inString, size_t inMaxSize)
-{
-    size_t n;
-
-    /* Note that we do not check if s == nullptr, because we do not
-     * return errno_t...
-     */
-
-    for (n = 0; n < inMaxSize && *inString; n++, inString++)
-        ;
-
-    return n;
-}
-
-#endif
 
-/* wcsnlen */
 _SAFECRT__EXTERN_C
 size_t __cdecl wcsnlen(const WCHAR *inString, size_t inMaxSize);
 

pal/src/CMakeLists.txt

@@ -99,7 +99,6 @@ set(SOURCES
   cruntime/printf.cpp
   cruntime/printfcpp.cpp
   cruntime/silent_printf.cpp
-  cruntime/string.cpp
   cruntime/stringtls.cpp
   cruntime/thread.cpp
   cruntime/wchar.cpp

pal/src/cruntime/file.cpp

@@ -283,10 +283,10 @@ PAL_fopen(const char * fileName, const char * mode)
             goto done;
         }
 
-        UnixFileName = PAL__strdup(fileName);
+        UnixFileName = strdup(fileName);
         if (UnixFileName == NULL )
         {
-            ERROR("PAL__strdup() failed\n");
+            ERROR("strdup() failed\n");
             SetLastError(ERROR_NOT_ENOUGH_MEMORY);
             goto done;
         }

pal/src/cruntime/malloc.cpp

@@ -114,22 +114,3 @@ CorUnix::InternalMalloc(
     pvMem = (void*)malloc(szSize);
     return pvMem;
 }
-
-char *
-__cdecl
-PAL__strdup(
-    const char *c_szStr
-    )
-{
-    return InternalStrdup(c_szStr);
-}
-
-char *
-CorUnix::InternalStrdup(
-    const char *c_szStr
-    )
-{
-    char *pszStrCopy;
-    pszStrCopy = strdup(c_szStr);
-    return pszStrCopy;
-}

pal/src/cruntime/misc.cpp

@@ -433,7 +433,7 @@ BOOL MiscPutenv(const char *string, BOOL deleteIfEmpty)
         // See if we are replacing an item or adding one.
 
         // Make our copy up front, since we'll use it either way.
-        copy = InternalStrdup(string);
+        copy = strdup(string);
         if (copy == NULL)
         {
             goto done;