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

1-17 C1

Browse Source
This commit is contained in:
Manoj Ampalam 2016-01-17 00:14:19 -08:00
parent b345f4581f
commit e642fa78ec
2 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
contrib/win32/w32-posix-prototype/win32posix/win32posix/fileio.c
View File

@ -39,8 +39,8 @@ int fileio_pipe(struct w32_io* pio[2]) {
sec_attributes.nLength = 0; sec_attributes.nLength = 0;
read_handle = CreateNamedPipeA(pipe_name, read_handle = CreateNamedPipeA(pipe_name,
PIPE_ACCESS_INBOUND | FILE_FLAG_FIRST_PIPE_INSTANCE, PIPE_ACCESS_INBOUND | FILE_FLAG_OVERLAPPED,
PIPE_TYPE_BYTE | PIPE_NOWAIT, PIPE_TYPE_BYTE | PIPE_WAIT,
1, 1,
4096, 4096,
4096, 4096,
@ -56,7 +56,7 @@ int fileio_pipe(struct w32_io* pio[2]) {
0, 0,
&sec_attributes, &sec_attributes,
OPEN_EXISTING, OPEN_EXISTING,
FILE_ATTRIBUTE_NORMAL, FILE_ATTRIBUTE_NORMAL | FILE_FLAG_OVERLAPPED,
NULL); NULL);
if (write_handle == INVALID_HANDLE_VALUE) { if (write_handle == INVALID_HANDLE_VALUE) {
errno = errno_from_Win32Error(); errno = errno_from_Win32Error();
@ -82,6 +82,7 @@ int fileio_pipe(struct w32_io* pio[2]) {
pio[0] = pio_read; pio[0] = pio_read;
pio[1] = pio_write; pio[1] = pio_write;
return 0;
error: error:
if (read_handle) if (read_handle)
@ -226,7 +227,9 @@ int fileio_read(struct w32_io* pio, void *dst, unsigned int max) {
} }
bytes_copied = min(max, pio->read_details.remaining); bytes_copied = min(max, pio->read_details.remaining);
memcpy(dst, pio->read_details.buf, bytes_copied); memcpy(dst, pio->read_details.buf + pio->read_details.completed, bytes_copied);
pio->read_details.remaining -= bytes_copied;
pio->read_details.completed += bytes_copied;
return bytes_copied; return bytes_copied;
} }
@ -273,23 +276,21 @@ int fileio_write(struct w32_io* pio, const void *buf, unsigned int max) {
pio->write_details.pending = TRUE; pio->write_details.pending = TRUE;
SleepEx(0, TRUE); SleepEx(0, TRUE);
if (w32_io_is_blocking(pio, FALSE)) { if (w32_io_is_blocking(pio)) {
while (pio->write_details.pending) { while (pio->write_details.pending) {
if (wait_for_any_event(NULL, 0, INFINITE) == -1) if (wait_for_any_event(NULL, 0, INFINITE) == -1)
return -1; return -1;
} }
} }
else { if (!pio->write_details.pending && pio->write_details.error){
if (!pio->write_details.pending && pio->write_details.error){ errno = EOTHER;
errno = EOTHER; return -1;
return -1;
}
return bytes_copied;
} }
return bytes_copied;
} }
else else
{ {
errno = EOTHER; errno = errno_from_Win32Error();
return -1; return -1;
} }
@ -300,7 +301,7 @@ int fileio_fstat(struct w32_io* pio, struct stat *buf) {
if (fd == -1) { if (fd == -1) {
errno = EOTHER; errno = EOTHER;
return NULL; return -1;
} }
return _fstat(fd, (struct _stat*)&buf); return _fstat(fd, (struct _stat*)&buf);
@ -353,20 +354,19 @@ int fileio_on_select(struct w32_io* pio, BOOL rd) {
if (!rd && pio->write_details.pending) if (!rd && pio->write_details.pending)
return 0; return 0;
if (rd) {
if (fileio_ReadFileEx(pio) == -1) if (rd)
return -1; return fileio_ReadFileEx(pio);
} else
else {
//nothing to do with write //nothing to do with write
} return 0;
} }
int fileio_close(struct w32_io* pio) { int fileio_close(struct w32_io* pio) {
CancelIo(pio->handle); CancelIo(pio->handle);
//let queued APCs (if any) drain //let queued APCs (if any) drain
SleepEx(1, TRUE); SleepEx(0, TRUE);
CloseHandle(pio->handle); CloseHandle(pio->handle);
if (pio->read_details.buf) if (pio->read_details.buf)

4
contrib/win32/w32-posix-prototype/win32posix/win32posix/w32fd.c
View File

@ -220,8 +220,8 @@ int w32_pipe(int *pfds){
//temporarily set occupied bit //temporarily set occupied bit
FD_SET(read_index, &fd_table.occupied); FD_SET(read_index, &fd_table.occupied);
write_index = fd_table_get_min_index(); write_index = fd_table_get_min_index();
FD_CLR(write_index, &fd_table.occupied); FD_CLR(read_index, &fd_table.occupied);
if (read_index == -1) if (write_index == -1)
return -1; return -1;
if (-1 == fileio_pipe(pio)) if (-1 == fileio_pipe(pio))