explicit strstr & strstr_P overload selection

introduce sys/ pgmspace.h, string.h and stdio.h
consistent signatures, avoid depending on newlib quirks
allow strstr & strstr_P to be the same thing

Author: mcspr

cores/esp8266/WString.cpp

@@ -32,8 +32,7 @@
 /*********************************************/
 
 struct __StringImpl {
-    // XXX since we are always building w/ C++ headers, these cannot be resolved through the type alone
-    // don't depend on glibc quirks alone, just try to reduce number of overloads by explicitly requesting them
+    // XXX String methods accepting `internal_strstr_t` should be able to properly select overloads
     // ref. https://gcc.gnu.org/bugzilla/show_bug.cgi?id=51785
 
     using internal_strstr_t = String::internal_strstr_t;
@@ -65,7 +64,7 @@ struct __StringImpl {
     inline static internal_strstr_t __attribute__((always_inline))
     select_strstr(const char *str) {
         return __pgm_expected(str)
-            ? strstr_P
+            ? overloaded_strstr(strstr_P)
             : overloaded_strstr(strstr);
     }
 

tests/host/common/stdio.h

@@ -0,0 +1,3 @@
+#pragma once
+#include_next <stdio.h>
+#include <sys/stdio.h>

tests/host/common/string.h

@@ -0,0 +1,3 @@
+#pragma once
+#include_next <string.h>
+#include <sys/string.h>

tests/host/core/test_string.cpp

@@ -45,7 +45,7 @@ TEST_CASE("String::trim", "[core][String]")
 TEST_CASE("String::replace", "[core][String]")
 {
     const char data[] = "The quick brown fox jumped over the lazy dog.";
-    String str = data;
+    String     str    = data;
     str.replace("fox", "vulpes vulpes");
     REQUIRE(str == "The quick brown vulpes vulpes jumped over the lazy dog.");
     str.replace("vulpes", "lis lis");

tests/host/sys/pgmspace.h

@@ -1,6 +1,7 @@
 /* PGMSPACE.H - Accessor utilities/types for accessing PROGMEM data */
 
-#ifndef _PGMSPACE_H_
+#pragma once
+
 #define _PGMSPACE_H_
 
 // These are no-ops in anything but the ESP8266, where they are defined in
@@ -50,38 +51,3 @@
 #define pgm_read_dword_far(addr) pgm_read_dword(addr)
 #define pgm_read_float_far(addr) pgm_read_float(addr)
 #define pgm_read_ptr_far(addr) pgm_read_ptr(addr)
-
-// Wrapper inlines for _P functions
-#include <stdio.h>
-#include <string.h>
-inline const char* strstr_P(const char* haystack, const char* needle)
-{
-    return strstr(haystack, needle);
-}
-inline char* strcpy_P(char* dest, const char* src)
-{
-    return strcpy(dest, src);
-}
-inline size_t strlen_P(const char* s)
-{
-    return strlen(s);
-}
-inline int vsnprintf_P(char* str, size_t size, const char* format, va_list ap)
-{
-    return vsnprintf(str, size, format, ap);
-}
-
-#define memcpy_P memcpy
-#define memmove_P memmove
-#define strncpy_P strncpy
-#define strcmp_P strcmp
-#define strcasecmp_P strcasecmp
-#define memccpy_P memccpy
-#define snprintf_P snprintf
-#define sprintf_P sprintf
-#define strncmp_P strncmp
-#define strncasecmp_P strncasecmp
-#define strcat_P strcat
-#define memcmp_P memcmp
-
-#endif

tests/host/sys/string.h

@@ -0,0 +1,20 @@
+#pragma once
+
+#include <stdio.h>
+#include <string.h>
+
+#define memccpy_P memccpy
+#define memcmp_P memcmp
+#define memcpy_P memcpy
+#define memmove_P memmove
+#define snprintf_P snprintf
+#define sprintf_P sprintf
+#define strcasecmp_P strcasecmp
+#define strcat_P strcat
+#define strcmp_P strcmp
+#define strcpy_P strcpy
+#define strlen_P strlen
+#define strncasecmp_P strncasecmp
+#define strncmp_P strncmp
+#define strncpy_P strncpy
+#define strstr_P strstr