arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-04-19 23:22:16 +03:00
Code

Add String::concat(char*, len) to allow non null-term strings (#6754)

Browse Source 
* Add comcat(char*, len) to Sting

Fixes #5061

Adds a concat(const char *data, int len) method which allows arbitrary
sequences of data (including ones w/embedded \0s) to be appended to a
String.  May be useful for certain MQTT operations.

Adds sanity test for the feature to host suite

* Review comment cleanups
This commit is contained in:
Earle F. Philhower, III 2019-11-14 00:58:07 +01:00 committed by david gauchard
parent d2d0ee3d43
commit 09896d5287
3 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cores/esp8266/WString.cpp
View File

@ -331,6 +331,7 @@ unsigned char String::concat(const char *cstr, unsigned int length) {
return 0; return 0;
memmove_P(wbuffer() + len(), cstr, length + 1); memmove_P(wbuffer() + len(), cstr, length + 1);
setLen(newlen); setLen(newlen);
wbuffer()[newlen] = 0;
return 1; return 1;
} }

2
cores/esp8266/WString.h
View File

@ -116,6 +116,7 @@ class String {
unsigned char concat(float num); unsigned char concat(float num);
unsigned char concat(double num); unsigned char concat(double num);
unsigned char concat(const __FlashStringHelper * str); unsigned char concat(const __FlashStringHelper * str);
unsigned char concat(const char *cstr, unsigned int length);
// if there's not enough memory for the concatenated value, the string // if there's not enough memory for the concatenated value, the string
// will be left unchanged (but this isn't signalled in any way) // will be left unchanged (but this isn't signalled in any way)
@ -311,7 +312,6 @@ class String {
void init(void); void init(void);
void invalidate(void); void invalidate(void);
unsigned char changeBuffer(unsigned int maxStrLen); unsigned char changeBuffer(unsigned int maxStrLen);
unsigned char concat(const char *cstr, unsigned int length);
// copy and move // copy and move
String & copy(const char *cstr, unsigned int length); String & copy(const char *cstr, unsigned int length);

16
tests/host/core/test_string.cpp
View File

@ -131,6 +131,22 @@ TEST_CASE("String concantenation", "[core][String]")
REQUIRE(str == "-100"); REQUIRE(str == "-100");
str = String((long)-100, 10); str = String((long)-100, 10);
REQUIRE(str == "-100"); REQUIRE(str == "-100");
// Non-zero-terminated array concatenation
const char buff[] = "abcdefg";
String n;
n = "1234567890"; // Make it a SSO string, fill with non-0 data
n = "1"; // Overwrite [1] with 0, but leave old junk in SSO space still
n.concat(buff, 3);
REQUIRE(n == "1abc"); // Ensure the trailing 0 is always present even w/this funky concat
for (int i=0; i<20; i++)
n.concat(buff, 1); // Add 20 'a's to go from SSO to normal string
REQUIRE(n == "1abcaaaaaaaaaaaaaaaaaaaa");
n = "";
for (int i=0; i<=5; i++)
n.concat(buff, i);
REQUIRE(n == "aababcabcdabcde");
n.concat(buff, 0); // And check no add'n
REQUIRE(n == "aababcabcdabcde");
} }
TEST_CASE("String comparison", "[core][String]") TEST_CASE("String comparison", "[core][String]")