moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-08-13 17:03:50 -04:00
Code Issues Releases Wiki Activity

sockfilt.c: properly handle disk files, pipes and character input

Browse Source
This commit is contained in:
Marc Hoersken 2014-04-20 22:15:36 +02:00
parent fe1c0176c1
commit 8ce852a279
1 changed files with 79 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

93
tests/server/sockfilt.c
View File

@ -515,24 +515,74 @@ static void lograw(unsigned char *buffer, ssize_t len)
*/ */
static DWORD WINAPI select_ws_stdin_wait_thread(LPVOID lpParameter) static DWORD WINAPI select_ws_stdin_wait_thread(LPVOID lpParameter)
{ {
HANDLE handle, handles[2];
INPUT_RECORD inputrecord; INPUT_RECORD inputrecord;
HANDLE handle; LARGE_INTEGER size, pos;
DWORD length; DWORD type, length;
handle = (HANDLE) lpParameter; handle = GetStdHandle(STD_INPUT_HANDLE);
handles[0] = (HANDLE) lpParameter;
handles[1] = handle;
type = GetFileType(handle);
if(GetConsoleMode(handle, &length)) { switch(type) {
while(WaitForSingleObjectEx(handle, INFINITE, FALSE) == WAIT_OBJECT_0) { case FILE_TYPE_DISK:
if(PeekConsoleInput(handle, &inputrecord, 1, &length)) { while(WaitForMultipleObjectsEx(2, handles, FALSE, INFINITE, FALSE)
if(length == 1 && inputrecord.EventType != KEY_EVENT) == WAIT_OBJECT_0 + 1) {
ReadConsoleInput(handle, &inputrecord, 1, &length); size.QuadPart = 0;
if(GetFileSizeEx(handle, &size)) {
pos.QuadPart = 0;
if(SetFilePointerEx(handle, pos, &pos, FILE_CURRENT)) {
if(size.QuadPart == pos.QuadPart)
SleepEx(100, FALSE);
else
break;
}
else
break;
}
else else
break; break;
} }
} break;
case FILE_TYPE_CHAR:
while(WaitForMultipleObjectsEx(2, handles, FALSE, INFINITE, FALSE)
== WAIT_OBJECT_0 + 1) {
if(GetConsoleMode(handle, &length)) {
length = 0;
if(PeekConsoleInput(handle, &inputrecord, 1, &length)) {
if(length == 1 && inputrecord.EventType != KEY_EVENT)
ReadConsoleInput(handle, &inputrecord, 1, &length);
else
break;
}
else
break;
}
else
break;
}
break;
case FILE_TYPE_PIPE:
while(WaitForMultipleObjectsEx(2, handles, FALSE, INFINITE, FALSE)
== WAIT_OBJECT_0 + 1) {
if(!PeekNamedPipe(handle, NULL, 0, NULL, &length, NULL)) {
if(GetLastError() == ERROR_BROKEN_PIPE)
SleepEx(100, FALSE);
else
break;
}
else
break;
}
break;
default:
WaitForMultipleObjectsEx(2, handles, FALSE, INFINITE, FALSE);
break;
} }
else
ReadFile(handle, NULL, 0, &length, NULL);
return 0; return 0;
} }
@ -546,6 +596,7 @@ static int select_ws(int nfds, fd_set *readfds, fd_set *writefds,
curl_socket_t sock, *fdarr, *wsasocks; curl_socket_t sock, *fdarr, *wsasocks;
long networkevents; long networkevents;
int error, fds; int error, fds;
HANDLE threadevent = NULL, threadhandle = NULL;
DWORD nfd = 0, wsa = 0; DWORD nfd = 0, wsa = 0;
int ret = 0; int ret = 0;
@ -613,10 +664,11 @@ static int select_ws(int nfds, fd_set *readfds, fd_set *writefds,
if(networkevents) { if(networkevents) {
fdarr[nfd] = curlx_sitosk(fds); fdarr[nfd] = curlx_sitosk(fds);
if(fds == fileno(stdin)) { if(fds == fileno(stdin)) {
handles[nfd] = CreateThread(NULL, 0, threadevent = CreateEvent(NULL, TRUE, FALSE, NULL);
threadhandle = CreateThread(NULL, 0,
&select_ws_stdin_wait_thread, &select_ws_stdin_wait_thread,
GetStdHandle(STD_INPUT_HANDLE), threadevent, 0, NULL);
0, NULL); handles[nfd] = threadhandle;
} }
else if(fds == fileno(stdout)) { else if(fds == fileno(stdout)) {
handles[nfd] = GetStdHandle(STD_OUTPUT_HANDLE); handles[nfd] = GetStdHandle(STD_OUTPUT_HANDLE);
@ -655,6 +707,11 @@ static int select_ws(int nfds, fd_set *readfds, fd_set *writefds,
/* wait for one of the internal handles to trigger */ /* wait for one of the internal handles to trigger */
wait = WaitForMultipleObjectsEx(nfd, handles, FALSE, milliseconds, FALSE); wait = WaitForMultipleObjectsEx(nfd, handles, FALSE, milliseconds, FALSE);
/* signal the event handle for the waiting thread */
if(threadevent) {
SetEvent(threadevent);
}
/* loop over the internal handles returned in the descriptors */ /* loop over the internal handles returned in the descriptors */
for(idx = 0; idx < nfd; idx++) { for(idx = 0; idx < nfd; idx++) {
handle = handles[idx]; handle = handles[idx];
@ -721,6 +778,14 @@ static int select_ws(int nfds, fd_set *readfds, fd_set *writefds,
WSACloseEvent(wsaevents[idx]); WSACloseEvent(wsaevents[idx]);
} }
if(threadhandle) {
WaitForSingleObject(threadhandle, INFINITE);
CloseHandle(threadhandle);
}
if(threadevent) {
CloseHandle(threadevent);
}
free(wsaevents); free(wsaevents);
free(wsasocks); free(wsasocks);
free(handles); free(handles);