workaround for broken Peek() method in StreamReader

jazzman55 · jazzman55 · commit 657e05684317 · 2024-12-17T15:38:47.000+01:00
diff --git a/src/MakoIoT.Device.Services.FileStorage/MakoStreamReader.cs b/src/MakoIoT.Device.Services.FileStorage/MakoStreamReader.cs
@@ -385,16 +385,10 @@ public override string ReadLine()
                     return new string(readLineBuff, 0, curPos);
                 }
 
-                // check for \r and \r\n
+                // skip \r and wait for \n, we can't use Peek() because it's broken :(
                 if (readLineBuff[curPos] == '\r')
                 {
-                    // If the next character is \n eat it
-                    if (Peek() == '\n')
-                    {
-                        _ = Read();
-                    }
-
-                    return new string(readLineBuff, 0, curPos);
+                    continue;
                 }
 
                 // move to the next byte

Original file line number	Diff line number	Diff line change
`@@ -385,16 +385,10 @@ public override string ReadLine()`
`385`	`385`	`return new string(readLineBuff, 0, curPos);`
`386`	`386`	`}`
`387`	`387`
`388`		`- // check for \r and \r\n`
	`388`	`+ // skip \r and wait for \n, we can't use Peek() because it's broken :(`
`389`	`389`	`if (readLineBuff[curPos] == '\r')`
`390`	`390`	`{`
`391`		`- // If the next character is \n eat it`
`392`		`- if (Peek() == '\n')`
`393`		`- {`
`394`		`- _ = Read();`
`395`		`- }`
`396`		`-`
`397`		`- return new string(readLineBuff, 0, curPos);`
	`391`	`+ continue;`
`398`	`392`	`}`
`399`	`393`
`400`	`394`	`// move to the next byte`