@@ -63,7 +63,6 @@ consoleEvent* head = NULL;
63
63
consoleEvent * tail = NULL ;
64
64
65
65
BOOL isRedirected = FALSE;
66
- BOOL istty = FALSE;
67
66
BOOL bRet = FALSE;
68
67
BOOL bNoScrollRegion = FALSE;
69
68
BOOL bStartup = TRUE;
@@ -75,8 +74,6 @@ HANDLE child_err = INVALID_HANDLE_VALUE;
75
74
HANDLE pipe_in = INVALID_HANDLE_VALUE ;
76
75
HANDLE pipe_out = INVALID_HANDLE_VALUE ;
77
76
HANDLE pipe_err = INVALID_HANDLE_VALUE ;
78
- HANDLE child_pipe_read = INVALID_HANDLE_VALUE ;
79
- HANDLE child_pipe_write = INVALID_HANDLE_VALUE ;
80
77
HANDLE child = INVALID_HANDLE_VALUE ;
81
78
HANDLE hConsoleBuffer = INVALID_HANDLE_VALUE ;
82
79
@@ -813,10 +810,6 @@ DWORD WINAPI ProcessPipes(LPVOID p) {
813
810
DWORD rd = 0 , wr = 0 , i = -1 ;
814
811
815
812
GOTO_CLEANUP_ON_FALSE (ReadFile (pipe_in , buf , 128 , & rd , NULL ));
816
- if (!istty ) { /* no tty, just send it accross */
817
- GOTO_CLEANUP_ON_FALSE (WriteFile (child_pipe_write , buf , rd , & wr , NULL ));
818
- continue ;
819
- }
820
813
821
814
bStartup = FALSE;
822
815
@@ -1076,12 +1069,6 @@ int wmain(int ac, wchar_t **av) {
1076
1069
1077
1070
memset (& sa , 0 , sizeof (SECURITY_ATTRIBUTES ));
1078
1071
sa .bInheritHandle = TRUE;
1079
- if (!CreatePipe (& child_pipe_read , & child_pipe_write , & sa , 128 ))
1080
- return -1 ;
1081
-
1082
- /* A console is attached if a tty is requested */
1083
- if (!AllocConsole ())
1084
- istty = TRUE;
1085
1072
1086
1073
/* create job to hold all child processes */
1087
1074
{
@@ -1116,9 +1103,8 @@ int wmain(int ac, wchar_t **av) {
1116
1103
1117
1104
if (isRedirected )
1118
1105
{
1119
- /* disable inheritance on child_pipe_write and pipe_in*/
1106
+ /* disable inheritance on pipe_in*/
1120
1107
GOTO_CLEANUP_ON_FALSE (SetHandleInformation (pipe_in , HANDLE_FLAG_INHERIT , 0 ));
1121
- GOTO_CLEANUP_ON_FALSE (SetHandleInformation (child_pipe_write , HANDLE_FLAG_INHERIT , 0 ));
1122
1108
}
1123
1109
1124
1110
/*TODO - pick this up from system32*/
@@ -1147,10 +1133,6 @@ int wmain(int ac, wchar_t **av) {
1147
1133
Sleep (1000 );
1148
1134
}
1149
1135
1150
- /* close unwanted handles*/
1151
- CloseHandle (child_pipe_read );
1152
- child_pipe_read = INVALID_HANDLE_VALUE ;
1153
-
1154
1136
/* monitor child exist */
1155
1137
child = pi .hProcess ;
1156
1138
monitor_thread = CreateThread (NULL , 0 , MonitorChild , NULL , 0 , NULL );
0 commit comments