max/nix-super
1
0
Fork 0
mirror of https://github.com/privatevoid-net/nix-super.git synced 2024-11-15 02:36:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add eofOk parameter to the Windows readLine impl

Browse source 
Now the two implementations are back in sync.
This commit is contained in:
John Ericson 2024-11-07 14:33:46 -05:00
parent 372353722e
commit a6149eb89d
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/libutil/windows/file-descriptor.cc
View file

@ -61,7 +61,7 @@ void writeFull(HANDLE handle, std::string_view s, bool allowInterrupts)
} }
std::string readLine(HANDLE handle) std::string readLine(HANDLE handle, bool eofOk)
{ {
std::string s; std::string s;
while (1) { while (1) {
@ -71,8 +71,12 @@ std::string readLine(HANDLE handle)
DWORD rd; DWORD rd;
if (!ReadFile(handle, &ch, 1, &rd, NULL)) { if (!ReadFile(handle, &ch, 1, &rd, NULL)) {
throw WinError("reading a line"); throw WinError("reading a line");
} else if (rd == 0) } else if (rd == 0) {
throw EndOfFile("unexpected EOF reading a line"); if (eofOk)
return s;
else
throw EndOfFile("unexpected EOF reading a line");
}
else { else {
if (ch == '\n') return s; if (ch == '\n') return s;
s += ch; s += ch;