suzanne.soy/racket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Windows: restore console handling of Ctl-Z as EOF

Browse Source
This commit is contained in:
Matthew Flatt 2018-05-24 09:30:20 -06:00
parent b00779863f
commit 643d0d2cc4
1 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
racket/src/rktio/rktio_fd.c
View File

@ -1030,6 +1030,9 @@ static long WINAPI WindowsFDReader(Win_FD_Input_Thread *th)
DWORD toget, got;
int perma_eof = 0, ft, is_console = 0;
HANDLE eof_wait = NULL;
# define CONSOLE_BUFFER_IN_SIZE 16
wchar_t w_buffer[CONSOLE_BUFFER_IN_SIZE];
int w_buf_count = 0;
ft = GetFileType((HANDLE)th->fd);
@ -1059,11 +1062,31 @@ static long WINAPI WindowsFDReader(Win_FD_Input_Thread *th)
if (!is_console)
ok = ReadFile(th->fd, th->buffer, toget, &got, NULL);
else {
# define CONSOLE_BUFFER_IN_SIZE 16
wchar_t w_buffer[CONSOLE_BUFFER_IN_SIZE];
ok = ReadConsoleW(th->fd, w_buffer, CONSOLE_BUFFER_IN_SIZE, &got, NULL);
if (w_buf_count) {
ok = 1;
got = w_buf_count;
} else
ok = ReadConsoleW(th->fd, w_buffer, CONSOLE_BUFFER_IN_SIZE, &got, NULL);
if (ok) {
/* check for Ctl-Z, and convert it to an EOF */
int i, move_start = 0, move_len = 0;
for (i = 0; i < got; i++) {
if (w_buffer[i] == 26 /* ctl-z */) {
move_start = i;
move_len = got - i;
if (i == 0) {
/* report EOF now */
move_start++;
move_len--;
}
got = i;
break;
}
}
got = WideCharToMultiByte(CP_UTF8, 0, w_buffer, got, th->buffer, RKTIO_FD_BUFFSIZE, NULL, 0);
if (move_len > 0)
memmove(w_buffer, w_buffer + move_start, sizeof(wchar_t) * move_len);
w_buf_count = move_len;
}
}
if (ok) {