Stream String readStringUntil() default to allow unlimited length

PaulStoffregen · Feb 21, 2023 · 4a75d04 · 4a75d04
1 parent 348413f
commit 4a75d04
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/teensy3/Stream.cpp b/teensy3/Stream.cpp
@@ -261,7 +261,7 @@ String Stream::readString(size_t max)
 {
 	String str;
 	size_t length = 0;
-	while (length < max) {
+	while (length < max || !max) {
 		int c = timedRead();
 		if (c < 0) {
 			setReadError();
@@ -278,7 +278,7 @@ String Stream::readStringUntil(char terminator, size_t max)
 {
 	String str;
 	size_t length = 0;
-	while (length < max) {
+	while (length < max || !max) {
 		int c = timedRead();
 		if (c < 0) {
 			setReadError();

diff --git a/teensy3/Stream.h b/teensy3/Stream.h
@@ -56,8 +56,8 @@ class Stream : public Print
 	size_t readBytes(uint8_t *buffer, size_t length) { return readBytes((char *)buffer, length); }
 	size_t readBytesUntil(char terminator, char *buffer, size_t length);
 	size_t readBytesUntil(char terminator, uint8_t *buffer, size_t length) { return readBytesUntil(terminator, (char *)buffer, length); }
-	String readString(size_t max = 120);
-	String readStringUntil(char terminator, size_t max = 120);
+	String readString(size_t max = 0 /* 0 means unlimited length */);
+	String readStringUntil(char terminator, size_t max = 0 /* 0 means unlimited length */);
 	int getReadError() { return read_error; }
 	void clearReadError() { setReadError(0); }
   protected:

diff --git a/teensy4/Stream.cpp b/teensy4/Stream.cpp
@@ -262,7 +262,7 @@ String Stream::readString(size_t max)
 {
 	String str;
 	size_t length = 0;
-	while (length < max) {
+	while (length < max || !max) {
 		int c = timedRead();
 		if (c < 0) {
 			setReadError();
@@ -279,7 +279,7 @@ String Stream::readStringUntil(char terminator, size_t max)
 {
 	String str;
 	size_t length = 0;
-	while (length < max) {
+	while (length < max || !max) {
 		int c = timedRead();
 		if (c < 0) {
 			setReadError();

diff --git a/teensy4/Stream.h b/teensy4/Stream.h
@@ -56,8 +56,8 @@ class Stream : public Print
 	size_t readBytes(uint8_t *buffer, size_t length) { return readBytes((char *)buffer, length); }
 	size_t readBytesUntil(char terminator, char *buffer, size_t length);
 	size_t readBytesUntil(char terminator, uint8_t *buffer, size_t length) { return readBytesUntil(terminator, (char *)buffer, length); }
-	String readString(size_t max = 120);
-	String readStringUntil(char terminator, size_t max = 120);
+	String readString(size_t max = 0 /* 0 means unlimited length */);
+	String readStringUntil(char terminator, size_t max = 0 /* 0 means unlimited length */);
 	int getReadError() { return read_error; }
 	void clearReadError() { setReadError(0); }
   protected: