Skip to content

Commit 7dc8bc3

Browse files
committed
Restore (limited) ability to quit isql using Ctrl+Z on Windows,
that was broken by additional fix for #8524 (commit e46ead9)
1 parent 8ee208b commit 7dc8bc3

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

src/isql/isql.epp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -354,10 +354,11 @@ static int win32ReadConsole(FILE* file, CharBuffer& mbBuffer)
354354
if (error == ERROR_NOT_ENOUGH_MEMORY && maxLineLength > 256)
355355
maxLineLength -= 256;
356356
else
357-
Firebird::system_error::raise("ReadConsoleW", error);
357+
system_error::raise("ReadConsoleW", error);
358358
}
359359

360-
if (!charsRead)
360+
constexpr WCHAR CtrlZ = 0x1a;
361+
if (!charsRead || (wideBuf[0] == CtrlZ))
361362
return 0;
362363

363364
int mbLength = WideCharToMultiByte(GetConsoleCP(), 0, wideBuf, charsRead,

0 commit comments

Comments
 (0)