tyler.durden/Win32-OpenSSH
1
0
Fork 0
mirror of https://github.com/PowerShell/Win32-OpenSSH.git synced 2025-07-23 14:04:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

term io initial implementation

Browse Source
This commit is contained in:
Manoj Ampalam 2016-03-15 15:15:24 -07:00
parent a67a8b8012
commit fb93bb95e2
4 changed files with 48 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/win32/win32compat/fileio.c
View File

@ -44,7 +44,7 @@
#define errno_from_Win32LastError() errno_from_Win32Error(GetLastError()) #define errno_from_Win32LastError() errno_from_Win32Error(GetLastError())
/* maps Win32 error to errno */ /* maps Win32 error to errno */
static int int
errno_from_Win32Error(int win32_error) errno_from_Win32Error(int win32_error)
{ {
switch (win32_error) { switch (win32_error) {

51
contrib/win32/win32compat/termio.c
View File

@ -2,25 +2,58 @@
#include "w32fd.h" #include "w32fd.h"
#include "inc/defs.h" #include "inc/defs.h"
/* Win7 - Read Term Support - START*/ #define TERM_IO_BUF_SIZE 2048
int errno_from_Win32Error(int win32_error);
int struct io_status {
fileio_initiateReadTerm_Win7(struct w32_io* pio) { char* buf[TERM_IO_BUF_SIZE];
DWORD transferred;
DWORD error;
};
if (pio->read_details.pending || w32_io_is_io_available(pio, TRUE)) { static struct io_status read_status, write_status;
debug("Win7 term read - ERROR - called in wrong state");
errno = EINVAL; static VOID CALLBACK ReadAPCProc(
_In_ ULONG_PTR dwParam
) {
struct w32_io* pio = (struct w32_io*)dwParam;
pio->read_details.error = read_status.error;
pio->read_details.remaining = read_status.transferred;
pio->read_details.completed = 0;
pio->read_details.pending = FALSE;
}
static DWORD WINAPI ReadThread(
_In_ LPVOID lpParameter
) {
struct w32_io* pio = (struct w32_io*)lpParameter;
memset(&read_status, 0, sizeof(read_status));
if (!ReadFile(WINHANDLE(pio), read_status.buf, TERM_IO_BUF_SIZE, &read_status.transferred, NULL)) {
read_status.error = GetLastError();
}
if (0 == QueueUserAPC(ReadAPCProc, main_thread, pio))
DebugBreak();
}
static int
termio_initiate_read(struct w32_io* pio) {
HANDLE read_thread = CreateThread(NULL, 0, ReadThread, pio, 0, NULL);
if (read_thread == NULL) {
errno = errno_from_Win32Error(GetLastError());
return -1; return -1;
} }
return 0; return 0;
} }
/* Win7 - Read Term Support - END*/
int int
termio_on_select(struct w32_io* pio, BOOL rd) { termio_on_select(struct w32_io* pio, BOOL rd) {
return fileio_on_select(pio, rd); if (!rd)
return 0;
if ((!fileio_is_io_available(pio, rd)) && (!pio->read_details.pending))
return termio_initiate_read(pio);
} }
int int

4
contrib/win32/win32compat/w32fd.c
View File

@ -48,6 +48,9 @@ static struct w32fd_table fd_table;
/* static table entries representing std in, out and error*/ /* static table entries representing std in, out and error*/
static struct w32_io w32_io_stdin, w32_io_stdout, w32_io_stderr; static struct w32_io w32_io_stdin, w32_io_stdout, w32_io_stderr;
/* main thread handle*/
HANDLE main_thread;
void fd_table_set(struct w32_io* pio, int index); void fd_table_set(struct w32_io* pio, int index);
/* initializes mapping table*/ /* initializes mapping table*/
@ -120,6 +123,7 @@ w32posix_initialize() {
if ((fd_table_initialize() != 0) if ((fd_table_initialize() != 0)
|| (socketio_initialize() != 0)) || (socketio_initialize() != 0))
DebugBreak(); DebugBreak();
main_thread = GetCurrentThread();
signalio_initialize(); signalio_initialize();
} }

1
contrib/win32/win32compat/w32fd.h
View File

@ -77,6 +77,7 @@ struct w32_io {
#define WINHANDLE(pio) (((pio)->type == STD_IO_FD)? GetStdHandle((pio)->std_handle):(pio)->handle) #define WINHANDLE(pio) (((pio)->type == STD_IO_FD)? GetStdHandle((pio)->std_handle):(pio)->handle)
#define FILETYPE(pio) (GetFileType(WINHANDLE(pio))) #define FILETYPE(pio) (GetFileType(WINHANDLE(pio)))
extern HANDLE main_thread;
BOOL w32_io_is_blocking(struct w32_io*); BOOL w32_io_is_blocking(struct w32_io*);
BOOL w32_io_is_io_available(struct w32_io* pio, BOOL rd); BOOL w32_io_is_io_available(struct w32_io* pio, BOOL rd);