tyler.durden
/
Win32-OpenSSH
mirror of https://github.com/PowerShell/Win32-OpenSSH.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

3-7 20:00

This commit is contained in:
manojampalam 2016-03-07 20:08:45 -08:00
parent e73111f3d9
commit 682fac1587
3 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -393,6 +393,8 @@ VOID CALLBACK WriteCompletionRoutine(
pio->write_details.remaining); pio->write_details.remaining);
pio->write_details.error = dwErrorCode; pio->write_details.error = dwErrorCode;
/* TODO - assert that remaining == dwNumberOfBytesTransfered */ /* TODO - assert that remaining == dwNumberOfBytesTransfered */
if (pio->write_details.remaining != dwNumberOfBytesTransfered)
abort();
pio->write_details.remaining -= dwNumberOfBytesTransfered; pio->write_details.remaining -= dwNumberOfBytesTransfered;
pio->write_details.pending = FALSE; pio->write_details.pending = FALSE;
} }
@ -453,6 +455,7 @@ fileio_write(struct w32_io* pio, const void *buf, unsigned int max) {
if (WriteFileEx(h, pio->write_details.buf, bytes_copied, if (WriteFileEx(h, pio->write_details.buf, bytes_copied,
&pio->write_overlapped, &WriteCompletionRoutine)) { &pio->write_overlapped, &WriteCompletionRoutine)) {
pio->write_details.pending = TRUE; pio->write_details.pending = TRUE;
pio->write_details.remaining = bytes_copied;
/* execute APC if write has completed */ /* execute APC if write has completed */
if (wait_for_any_event(NULL, 0, 0) == -1) if (wait_for_any_event(NULL, 0, 0) == -1)
return -1; return -1;

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

@ -622,7 +622,15 @@ w32_dup(int oldfd) {
return -1; return -1;
} }
if (!DuplicateHandle(GetCurrentProcess(), src, GetCurrentProcess(), &target, 0, TRUE, DUPLICATE_SAME_ACCESS)) { if ((oldfd == STDIN_FILENO) && (GetFileType(GetStdHandle(STD_INPUT_HANDLE)) == FILE_TYPE_CHAR)) {
target = CreateFile(L"CONIN$", GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_ALWAYS, FILE_FLAG_OVERLAPPED, NULL);
if (target == INVALID_HANDLE_VALUE) {
errno = EOTHER;
debug("ERROR: CreateFile CONIN$ failed, error:%d", GetLastError());
return -1;
}
}
else if (!DuplicateHandle(GetCurrentProcess(), src, GetCurrentProcess(), &target, 0, TRUE, DUPLICATE_SAME_ACCESS)) {
errno = EOTHER; errno = EOTHER;
debug("ERROR: Duplicated Handle failed, error:%d", GetLastError()); debug("ERROR: Duplicated Handle failed, error:%d", GetLastError());
return -1; return -1;
@ -636,6 +644,7 @@ w32_dup(int oldfd) {
return -1; return -1;
} }
memset(pio, 0, sizeof(struct w32_io));
pio->handle = target; pio->handle = target;
pio->type = FILE_FD; pio->type = FILE_FD;
fd_table_set(pio, min_index); fd_table_set(pio, min_index);

2
regress/unittests/win32compat/file_tests.c
View File

@ -239,7 +239,7 @@ void
file_tests() file_tests()
{ {
w32posix_initialize(); w32posix_initialize();
//console_io_test(); console_io_test();
//file_simple_fileio(); //file_simple_fileio();
file_blocking_io_tests(); file_blocking_io_tests();
file_nonblocking_io_tests(); file_nonblocking_io_tests();