node-pty 1.2.0-beta.6 → 1.2.0-beta.7

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (225) hide show
  1. package/README.md +3 -5
  2. package/binding.gyp +0 -20
  3. package/lib/terminal.test.js +4 -4
  4. package/lib/terminal.test.js.map +1 -1
  5. package/lib/unixTerminal.test.js +16 -14
  6. package/lib/unixTerminal.test.js.map +1 -1
  7. package/lib/windowsPtyAgent.js +32 -95
  8. package/lib/windowsPtyAgent.js.map +1 -1
  9. package/lib/windowsTerminal.js +1 -1
  10. package/lib/windowsTerminal.js.map +1 -1
  11. package/lib/windowsTerminal.test.js +13 -14
  12. package/lib/windowsTerminal.test.js.map +1 -1
  13. package/package.json +1 -1
  14. package/prebuilds/darwin-arm64/pty.node +0 -0
  15. package/prebuilds/darwin-arm64/spawn-helper +0 -0
  16. package/prebuilds/darwin-x64/pty.node +0 -0
  17. package/prebuilds/darwin-x64/spawn-helper +0 -0
  18. package/prebuilds/win32-arm64/conpty.node +0 -0
  19. package/prebuilds/win32-arm64/conpty.pdb +0 -0
  20. package/prebuilds/win32-arm64/conpty_console_list.node +0 -0
  21. package/prebuilds/win32-arm64/conpty_console_list.pdb +0 -0
  22. package/prebuilds/win32-x64/conpty.node +0 -0
  23. package/prebuilds/win32-x64/conpty.pdb +0 -0
  24. package/prebuilds/win32-x64/conpty_console_list.node +0 -0
  25. package/prebuilds/win32-x64/conpty_console_list.pdb +0 -0
  26. package/scripts/post-install.js +1 -5
  27. package/src/interfaces.ts +8 -0
  28. package/src/native.d.ts +0 -17
  29. package/src/terminal.test.ts +4 -4
  30. package/src/unixTerminal.test.ts +8 -4
  31. package/src/win/conpty.cc +1 -2
  32. package/src/windowsPtyAgent.ts +31 -91
  33. package/src/windowsTerminal.test.ts +13 -13
  34. package/src/windowsTerminal.ts +1 -1
  35. package/typings/node-pty.d.ts +9 -8
  36. package/deps/winpty/.drone.yml +0 -17
  37. package/deps/winpty/.gitattributes +0 -19
  38. package/deps/winpty/LICENSE +0 -21
  39. package/deps/winpty/Makefile +0 -166
  40. package/deps/winpty/README.md +0 -151
  41. package/deps/winpty/RELEASES.md +0 -280
  42. package/deps/winpty/VERSION.txt +0 -1
  43. package/deps/winpty/configure +0 -167
  44. package/deps/winpty/misc/BufferResizeTests.cc +0 -90
  45. package/deps/winpty/misc/ChangeScreenBuffer.cc +0 -53
  46. package/deps/winpty/misc/ClearConsole.cc +0 -72
  47. package/deps/winpty/misc/ConinMode.cc +0 -117
  48. package/deps/winpty/misc/ConinMode.ps1 +0 -116
  49. package/deps/winpty/misc/ConoutMode.cc +0 -113
  50. package/deps/winpty/misc/DebugClient.py +0 -42
  51. package/deps/winpty/misc/DebugServer.py +0 -63
  52. package/deps/winpty/misc/DumpLines.py +0 -5
  53. package/deps/winpty/misc/EnableExtendedFlags.txt +0 -46
  54. package/deps/winpty/misc/Font-Report-June2016/CP437-Consolas.txt +0 -528
  55. package/deps/winpty/misc/Font-Report-June2016/CP437-Lucida.txt +0 -633
  56. package/deps/winpty/misc/Font-Report-June2016/CP932.txt +0 -630
  57. package/deps/winpty/misc/Font-Report-June2016/CP936.txt +0 -630
  58. package/deps/winpty/misc/Font-Report-June2016/CP949.txt +0 -630
  59. package/deps/winpty/misc/Font-Report-June2016/CP950.txt +0 -630
  60. package/deps/winpty/misc/Font-Report-June2016/MinimumWindowWidths.txt +0 -16
  61. package/deps/winpty/misc/Font-Report-June2016/Results.txt +0 -4
  62. package/deps/winpty/misc/Font-Report-June2016/Windows10SetFontBugginess.txt +0 -144
  63. package/deps/winpty/misc/FontSurvey.cc +0 -100
  64. package/deps/winpty/misc/FormatChar.h +0 -21
  65. package/deps/winpty/misc/FreezePerfTest.cc +0 -62
  66. package/deps/winpty/misc/GetCh.cc +0 -20
  67. package/deps/winpty/misc/GetConsolePos.cc +0 -41
  68. package/deps/winpty/misc/GetFont.cc +0 -261
  69. package/deps/winpty/misc/IdentifyConsoleWindow.ps1 +0 -51
  70. package/deps/winpty/misc/IsNewConsole.cc +0 -87
  71. package/deps/winpty/misc/MouseInputNotes.txt +0 -90
  72. package/deps/winpty/misc/MoveConsoleWindow.cc +0 -34
  73. package/deps/winpty/misc/Notes.txt +0 -219
  74. package/deps/winpty/misc/OSVersion.cc +0 -27
  75. package/deps/winpty/misc/ScreenBufferFreezeInactive.cc +0 -101
  76. package/deps/winpty/misc/ScreenBufferTest.cc +0 -671
  77. package/deps/winpty/misc/ScreenBufferTest2.cc +0 -151
  78. package/deps/winpty/misc/SelectAllTest.cc +0 -45
  79. package/deps/winpty/misc/SetBufferSize.cc +0 -32
  80. package/deps/winpty/misc/SetCursorPos.cc +0 -10
  81. package/deps/winpty/misc/SetFont.cc +0 -145
  82. package/deps/winpty/misc/SetWindowRect.cc +0 -36
  83. package/deps/winpty/misc/ShowArgv.cc +0 -12
  84. package/deps/winpty/misc/ShowConsoleInput.cc +0 -40
  85. package/deps/winpty/misc/Spew.py +0 -5
  86. package/deps/winpty/misc/TestUtil.cc +0 -172
  87. package/deps/winpty/misc/UnicodeDoubleWidthTest.cc +0 -102
  88. package/deps/winpty/misc/UnicodeWideTest1.cc +0 -246
  89. package/deps/winpty/misc/UnicodeWideTest2.cc +0 -130
  90. package/deps/winpty/misc/UnixEcho.cc +0 -89
  91. package/deps/winpty/misc/Utf16Echo.cc +0 -46
  92. package/deps/winpty/misc/VeryLargeRead.cc +0 -122
  93. package/deps/winpty/misc/VkEscapeTest.cc +0 -56
  94. package/deps/winpty/misc/Win10ResizeWhileFrozen.cc +0 -52
  95. package/deps/winpty/misc/Win10WrapTest1.cc +0 -57
  96. package/deps/winpty/misc/Win10WrapTest2.cc +0 -30
  97. package/deps/winpty/misc/Win32Echo1.cc +0 -26
  98. package/deps/winpty/misc/Win32Echo2.cc +0 -19
  99. package/deps/winpty/misc/Win32Test1.cc +0 -46
  100. package/deps/winpty/misc/Win32Test2.cc +0 -70
  101. package/deps/winpty/misc/Win32Test3.cc +0 -78
  102. package/deps/winpty/misc/Win32Write1.cc +0 -44
  103. package/deps/winpty/misc/WindowsBugCrashReader.cc +0 -27
  104. package/deps/winpty/misc/WriteConsole.cc +0 -106
  105. package/deps/winpty/misc/build32.sh +0 -9
  106. package/deps/winpty/misc/build64.sh +0 -9
  107. package/deps/winpty/misc/color-test.sh +0 -212
  108. package/deps/winpty/misc/font-notes.txt +0 -300
  109. package/deps/winpty/misc/winbug-15048.cc +0 -201
  110. package/deps/winpty/ship/build-pty4j-libpty.bat +0 -36
  111. package/deps/winpty/ship/common_ship.py +0 -53
  112. package/deps/winpty/ship/make_msvc_package.py +0 -165
  113. package/deps/winpty/ship/ship.py +0 -108
  114. package/deps/winpty/src/agent/Agent.cc +0 -613
  115. package/deps/winpty/src/agent/Agent.h +0 -103
  116. package/deps/winpty/src/agent/AgentCreateDesktop.cc +0 -84
  117. package/deps/winpty/src/agent/AgentCreateDesktop.h +0 -28
  118. package/deps/winpty/src/agent/ConsoleFont.cc +0 -632
  119. package/deps/winpty/src/agent/ConsoleFont.h +0 -28
  120. package/deps/winpty/src/agent/ConsoleInput.cc +0 -852
  121. package/deps/winpty/src/agent/ConsoleInput.h +0 -109
  122. package/deps/winpty/src/agent/ConsoleInputReencoding.cc +0 -121
  123. package/deps/winpty/src/agent/ConsoleInputReencoding.h +0 -36
  124. package/deps/winpty/src/agent/ConsoleLine.cc +0 -152
  125. package/deps/winpty/src/agent/ConsoleLine.h +0 -41
  126. package/deps/winpty/src/agent/Coord.h +0 -87
  127. package/deps/winpty/src/agent/DebugShowInput.cc +0 -239
  128. package/deps/winpty/src/agent/DebugShowInput.h +0 -32
  129. package/deps/winpty/src/agent/DefaultInputMap.cc +0 -422
  130. package/deps/winpty/src/agent/DefaultInputMap.h +0 -28
  131. package/deps/winpty/src/agent/DsrSender.h +0 -30
  132. package/deps/winpty/src/agent/EventLoop.cc +0 -99
  133. package/deps/winpty/src/agent/EventLoop.h +0 -47
  134. package/deps/winpty/src/agent/InputMap.cc +0 -246
  135. package/deps/winpty/src/agent/InputMap.h +0 -114
  136. package/deps/winpty/src/agent/LargeConsoleRead.cc +0 -71
  137. package/deps/winpty/src/agent/LargeConsoleRead.h +0 -68
  138. package/deps/winpty/src/agent/NamedPipe.cc +0 -378
  139. package/deps/winpty/src/agent/NamedPipe.h +0 -125
  140. package/deps/winpty/src/agent/Scraper.cc +0 -699
  141. package/deps/winpty/src/agent/Scraper.h +0 -103
  142. package/deps/winpty/src/agent/SimplePool.h +0 -75
  143. package/deps/winpty/src/agent/SmallRect.h +0 -143
  144. package/deps/winpty/src/agent/Terminal.cc +0 -535
  145. package/deps/winpty/src/agent/Terminal.h +0 -69
  146. package/deps/winpty/src/agent/UnicodeEncoding.h +0 -157
  147. package/deps/winpty/src/agent/UnicodeEncodingTest.cc +0 -189
  148. package/deps/winpty/src/agent/Win32Console.cc +0 -107
  149. package/deps/winpty/src/agent/Win32Console.h +0 -67
  150. package/deps/winpty/src/agent/Win32ConsoleBuffer.cc +0 -193
  151. package/deps/winpty/src/agent/Win32ConsoleBuffer.h +0 -99
  152. package/deps/winpty/src/agent/main.cc +0 -114
  153. package/deps/winpty/src/agent/subdir.mk +0 -61
  154. package/deps/winpty/src/configurations.gypi +0 -60
  155. package/deps/winpty/src/debugserver/DebugServer.cc +0 -117
  156. package/deps/winpty/src/debugserver/subdir.mk +0 -41
  157. package/deps/winpty/src/include/winpty.h +0 -242
  158. package/deps/winpty/src/include/winpty_constants.h +0 -131
  159. package/deps/winpty/src/libwinpty/AgentLocation.cc +0 -75
  160. package/deps/winpty/src/libwinpty/AgentLocation.h +0 -28
  161. package/deps/winpty/src/libwinpty/LibWinptyException.h +0 -54
  162. package/deps/winpty/src/libwinpty/WinptyInternal.h +0 -72
  163. package/deps/winpty/src/libwinpty/subdir.mk +0 -46
  164. package/deps/winpty/src/libwinpty/winpty.cc +0 -970
  165. package/deps/winpty/src/shared/AgentMsg.h +0 -38
  166. package/deps/winpty/src/shared/BackgroundDesktop.cc +0 -122
  167. package/deps/winpty/src/shared/BackgroundDesktop.h +0 -73
  168. package/deps/winpty/src/shared/Buffer.cc +0 -103
  169. package/deps/winpty/src/shared/Buffer.h +0 -102
  170. package/deps/winpty/src/shared/DebugClient.cc +0 -187
  171. package/deps/winpty/src/shared/DebugClient.h +0 -38
  172. package/deps/winpty/src/shared/GenRandom.cc +0 -138
  173. package/deps/winpty/src/shared/GenRandom.h +0 -55
  174. package/deps/winpty/src/shared/GetCommitHash.bat +0 -13
  175. package/deps/winpty/src/shared/Mutex.h +0 -54
  176. package/deps/winpty/src/shared/OsModule.h +0 -63
  177. package/deps/winpty/src/shared/OwnedHandle.cc +0 -36
  178. package/deps/winpty/src/shared/OwnedHandle.h +0 -45
  179. package/deps/winpty/src/shared/PrecompiledHeader.h +0 -43
  180. package/deps/winpty/src/shared/StringBuilder.h +0 -227
  181. package/deps/winpty/src/shared/StringBuilderTest.cc +0 -114
  182. package/deps/winpty/src/shared/StringUtil.cc +0 -55
  183. package/deps/winpty/src/shared/StringUtil.h +0 -80
  184. package/deps/winpty/src/shared/TimeMeasurement.h +0 -63
  185. package/deps/winpty/src/shared/UnixCtrlChars.h +0 -45
  186. package/deps/winpty/src/shared/UpdateGenVersion.bat +0 -20
  187. package/deps/winpty/src/shared/WindowsSecurity.cc +0 -460
  188. package/deps/winpty/src/shared/WindowsSecurity.h +0 -104
  189. package/deps/winpty/src/shared/WindowsVersion.cc +0 -252
  190. package/deps/winpty/src/shared/WindowsVersion.h +0 -29
  191. package/deps/winpty/src/shared/WinptyAssert.cc +0 -55
  192. package/deps/winpty/src/shared/WinptyAssert.h +0 -64
  193. package/deps/winpty/src/shared/WinptyException.cc +0 -57
  194. package/deps/winpty/src/shared/WinptyException.h +0 -43
  195. package/deps/winpty/src/shared/WinptyVersion.cc +0 -42
  196. package/deps/winpty/src/shared/WinptyVersion.h +0 -27
  197. package/deps/winpty/src/shared/winpty_snprintf.h +0 -99
  198. package/deps/winpty/src/subdir.mk +0 -5
  199. package/deps/winpty/src/tests/subdir.mk +0 -28
  200. package/deps/winpty/src/tests/trivial_test.cc +0 -158
  201. package/deps/winpty/src/unix-adapter/InputHandler.cc +0 -114
  202. package/deps/winpty/src/unix-adapter/InputHandler.h +0 -56
  203. package/deps/winpty/src/unix-adapter/OutputHandler.cc +0 -80
  204. package/deps/winpty/src/unix-adapter/OutputHandler.h +0 -53
  205. package/deps/winpty/src/unix-adapter/Util.cc +0 -86
  206. package/deps/winpty/src/unix-adapter/Util.h +0 -31
  207. package/deps/winpty/src/unix-adapter/WakeupFd.cc +0 -70
  208. package/deps/winpty/src/unix-adapter/WakeupFd.h +0 -42
  209. package/deps/winpty/src/unix-adapter/main.cc +0 -729
  210. package/deps/winpty/src/unix-adapter/subdir.mk +0 -41
  211. package/deps/winpty/src/winpty.gyp +0 -236
  212. package/deps/winpty/vcbuild.bat +0 -83
  213. package/prebuilds/win32-arm64/pty.node +0 -0
  214. package/prebuilds/win32-arm64/pty.pdb +0 -0
  215. package/prebuilds/win32-arm64/winpty-agent.exe +0 -0
  216. package/prebuilds/win32-arm64/winpty-agent.pdb +0 -0
  217. package/prebuilds/win32-arm64/winpty.dll +0 -0
  218. package/prebuilds/win32-arm64/winpty.pdb +0 -0
  219. package/prebuilds/win32-x64/pty.node +0 -0
  220. package/prebuilds/win32-x64/pty.pdb +0 -0
  221. package/prebuilds/win32-x64/winpty-agent.exe +0 -0
  222. package/prebuilds/win32-x64/winpty-agent.pdb +0 -0
  223. package/prebuilds/win32-x64/winpty.dll +0 -0
  224. package/prebuilds/win32-x64/winpty.pdb +0 -0
  225. package/src/win/winpty.cc +0 -333
@@ -1,28 +0,0 @@
1
- # Copyright (c) 2015 Ryan Prichard
2
- #
3
- # Permission is hereby granted, free of charge, to any person obtaining a copy
4
- # of this software and associated documentation files (the "Software"), to
5
- # deal in the Software without restriction, including without limitation the
6
- # rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
7
- # sell copies of the Software, and to permit persons to whom the Software is
8
- # furnished to do so, subject to the following conditions:
9
- #
10
- # The above copyright notice and this permission notice shall be included in
11
- # all copies or substantial portions of the Software.
12
- #
13
- # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
14
- # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
15
- # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
16
- # AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
17
- # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
18
- # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
19
- # IN THE SOFTWARE.
20
-
21
- build/%.exe : src/tests/%.cc build/winpty.dll
22
- $(info Building $@)
23
- @$(MINGW_CXX) $(MINGW_CXXFLAGS) $(MINGW_LDFLAGS) -o $@ $^
24
-
25
- TEST_PROGRAMS = \
26
- build/trivial_test.exe
27
-
28
- -include $(TEST_PROGRAMS:.exe=.d)
@@ -1,158 +0,0 @@
1
- // Copyright (c) 2015 Ryan Prichard
2
- //
3
- // Permission is hereby granted, free of charge, to any person obtaining a copy
4
- // of this software and associated documentation files (the "Software"), to
5
- // deal in the Software without restriction, including without limitation the
6
- // rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
7
- // sell copies of the Software, and to permit persons to whom the Software is
8
- // furnished to do so, subject to the following conditions:
9
- //
10
- // The above copyright notice and this permission notice shall be included in
11
- // all copies or substantial portions of the Software.
12
- //
13
- // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
14
- // IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
15
- // FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
16
- // AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
17
- // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
18
- // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
19
- // IN THE SOFTWARE.
20
-
21
- #include <windows.h>
22
-
23
- #include <cassert>
24
- #include <cctype>
25
- #include <cstdio>
26
- #include <cstdlib>
27
- #include <cwchar>
28
- #include <vector>
29
-
30
- #include "../include/winpty.h"
31
- #include "../shared/DebugClient.h"
32
-
33
- static std::vector<unsigned char> filterContent(
34
- const std::vector<unsigned char> &content) {
35
- std::vector<unsigned char> result;
36
- auto it = content.begin();
37
- const auto itEnd = content.end();
38
- while (it < itEnd) {
39
- if (*it == '\r') {
40
- // Filter out carriage returns. Sometimes the output starts with
41
- // a single CR; other times, it has multiple CRs.
42
- it++;
43
- } else if (*it == '\x1b' && (it + 1) < itEnd && *(it + 1) == '[') {
44
- // Filter out escape sequences. They have no interior letters and
45
- // end with a single letter.
46
- it += 2;
47
- while (it < itEnd && !isalpha(*it)) {
48
- it++;
49
- }
50
- it++;
51
- } else {
52
- // Let everything else through.
53
- result.push_back(*it);
54
- it++;
55
- }
56
- }
57
- return result;
58
- }
59
-
60
- // Read bytes from the non-overlapped file handle until the file is closed or
61
- // until an I/O error occurs.
62
- static std::vector<unsigned char> readAll(HANDLE handle) {
63
- unsigned char buf[1024];
64
- std::vector<unsigned char> result;
65
- while (true) {
66
- DWORD amount = 0;
67
- BOOL ret = ReadFile(handle, buf, sizeof(buf), &amount, nullptr);
68
- if (!ret || amount == 0) {
69
- break;
70
- }
71
- result.insert(result.end(), buf, buf + amount);
72
- }
73
- return result;
74
- }
75
-
76
- static void parentTest() {
77
- wchar_t program[1024];
78
- wchar_t cmdline[1024];
79
- GetModuleFileNameW(nullptr, program, 1024);
80
-
81
- {
82
- // XXX: We'd like to use swprintf, which is part of C99 and takes a
83
- // size_t maxlen argument. MinGW-w64 has this function, as does MSVC.
84
- // The old MinGW doesn't, though -- instead, it apparently provides an
85
- // swprintf taking no maxlen argument. This *might* be a regression?
86
- // (There is also no swnprintf, but that function is obsolescent with a
87
- // correct swprintf, and it isn't in POSIX or ISO C.)
88
- //
89
- // Visual C++ 6 also provided this non-conformant swprintf, and I'm
90
- // guessing MSVCRT.DLL does too. (My impression is that the old MinGW
91
- // prefers to rely on MSVCRT.DLL for convenience?)
92
- //
93
- // I could compile differently for old MinGW, but what if it fixes its
94
- // function later? Instead, use a workaround. It's starting to make
95
- // sense to drop MinGW support in favor of MinGW-w64. This is too
96
- // annoying.
97
- //
98
- // grepbait: OLD-MINGW / WINPTY_TARGET_MSYS1
99
- cmdline[0] = L'\0';
100
- wcscat(cmdline, L"\"");
101
- wcscat(cmdline, program);
102
- wcscat(cmdline, L"\" CHILD");
103
- }
104
- // swnprintf(cmdline, sizeof(cmdline) / sizeof(cmdline[0]),
105
- // L"\"%ls\" CHILD", program);
106
-
107
- auto agentCfg = winpty_config_new(0, nullptr);
108
- assert(agentCfg != nullptr);
109
- auto pty = winpty_open(agentCfg, nullptr);
110
- assert(pty != nullptr);
111
- winpty_config_free(agentCfg);
112
-
113
- HANDLE conin = CreateFileW(
114
- winpty_conin_name(pty),
115
- GENERIC_WRITE, 0, nullptr, OPEN_EXISTING, 0, nullptr);
116
- HANDLE conout = CreateFileW(
117
- winpty_conout_name(pty),
118
- GENERIC_READ, 0, nullptr, OPEN_EXISTING, 0, nullptr);
119
- assert(conin != INVALID_HANDLE_VALUE);
120
- assert(conout != INVALID_HANDLE_VALUE);
121
-
122
- auto spawnCfg = winpty_spawn_config_new(
123
- WINPTY_SPAWN_FLAG_AUTO_SHUTDOWN, program, cmdline,
124
- nullptr, nullptr, nullptr);
125
- assert(spawnCfg != nullptr);
126
- HANDLE process = nullptr;
127
- BOOL spawnSuccess = winpty_spawn(
128
- pty, spawnCfg, &process, nullptr, nullptr, nullptr);
129
- assert(spawnSuccess && process != nullptr);
130
-
131
- auto content = readAll(conout);
132
- content = filterContent(content);
133
-
134
- std::vector<unsigned char> expectedContent = {
135
- 'H', 'I', '\n', 'X', 'Y', '\n'
136
- };
137
- DWORD exitCode = 0;
138
- assert(GetExitCodeProcess(process, &exitCode) && exitCode == 42);
139
- CloseHandle(process);
140
- CloseHandle(conin);
141
- CloseHandle(conout);
142
- assert(content == expectedContent);
143
- winpty_free(pty);
144
- }
145
-
146
- static void childTest() {
147
- printf("HI\nXY\n");
148
- exit(42);
149
- }
150
-
151
- int main(int argc, char *argv[]) {
152
- if (argc == 1) {
153
- parentTest();
154
- } else {
155
- childTest();
156
- }
157
- return 0;
158
- }
@@ -1,114 +0,0 @@
1
- // Copyright (c) 2011-2015 Ryan Prichard
2
- //
3
- // Permission is hereby granted, free of charge, to any person obtaining a copy
4
- // of this software and associated documentation files (the "Software"), to
5
- // deal in the Software without restriction, including without limitation the
6
- // rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
7
- // sell copies of the Software, and to permit persons to whom the Software is
8
- // furnished to do so, subject to the following conditions:
9
- //
10
- // The above copyright notice and this permission notice shall be included in
11
- // all copies or substantial portions of the Software.
12
- //
13
- // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
14
- // IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
15
- // FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
16
- // AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
17
- // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
18
- // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
19
- // IN THE SOFTWARE.
20
-
21
- #include "InputHandler.h"
22
-
23
- #include <assert.h>
24
- #include <errno.h>
25
- #include <stdio.h>
26
- #include <sys/select.h>
27
- #include <unistd.h>
28
-
29
- #include <algorithm>
30
- #include <vector>
31
-
32
- #include "../shared/DebugClient.h"
33
- #include "Util.h"
34
- #include "WakeupFd.h"
35
-
36
- InputHandler::InputHandler(
37
- HANDLE conin, int inputfd, WakeupFd &completionWakeup) :
38
- m_conin(conin),
39
- m_inputfd(inputfd),
40
- m_completionWakeup(completionWakeup),
41
- m_threadHasBeenJoined(false),
42
- m_shouldShutdown(0),
43
- m_threadCompleted(0)
44
- {
45
- pthread_create(&m_thread, NULL, InputHandler::threadProcS, this);
46
- }
47
-
48
- void InputHandler::shutdown() {
49
- startShutdown();
50
- if (!m_threadHasBeenJoined) {
51
- int ret = pthread_join(m_thread, NULL);
52
- assert(ret == 0 && "pthread_join failed");
53
- m_threadHasBeenJoined = true;
54
- }
55
- }
56
-
57
- void InputHandler::threadProc() {
58
- std::vector<char> buffer(4096);
59
- fd_set readfds;
60
- FD_ZERO(&readfds);
61
- while (true) {
62
- // Handle shutdown.
63
- m_wakeup.reset();
64
- if (m_shouldShutdown) {
65
- trace("InputHandler: shutting down");
66
- break;
67
- }
68
-
69
- // Block until data arrives.
70
- {
71
- const int max_fd = std::max(m_inputfd, m_wakeup.fd());
72
- FD_SET(m_inputfd, &readfds);
73
- FD_SET(m_wakeup.fd(), &readfds);
74
- selectWrapper("InputHandler", max_fd + 1, &readfds);
75
- if (!FD_ISSET(m_inputfd, &readfds)) {
76
- continue;
77
- }
78
- }
79
-
80
- const int numRead = read(m_inputfd, &buffer[0], buffer.size());
81
- if (numRead == -1 && errno == EINTR) {
82
- // Apparently, this read is interrupted on Cygwin 1.7 by a SIGWINCH
83
- // signal even though I set the SA_RESTART flag on the handler.
84
- continue;
85
- }
86
-
87
- // tty is closed, or the read failed for some unexpected reason.
88
- if (numRead <= 0) {
89
- trace("InputHandler: tty read failed: numRead=%d", numRead);
90
- break;
91
- }
92
-
93
- DWORD written = 0;
94
- BOOL ret = WriteFile(m_conin,
95
- &buffer[0], numRead,
96
- &written, NULL);
97
- if (!ret || written != static_cast<DWORD>(numRead)) {
98
- if (!ret && GetLastError() == ERROR_BROKEN_PIPE) {
99
- trace("InputHandler: pipe closed: written=%u",
100
- static_cast<unsigned int>(written));
101
- } else {
102
- trace("InputHandler: write failed: "
103
- "ret=%d lastError=0x%x numRead=%d written=%u",
104
- ret,
105
- static_cast<unsigned int>(GetLastError()),
106
- numRead,
107
- static_cast<unsigned int>(written));
108
- }
109
- break;
110
- }
111
- }
112
- m_threadCompleted = 1;
113
- m_completionWakeup.set();
114
- }
@@ -1,56 +0,0 @@
1
- // Copyright (c) 2011-2015 Ryan Prichard
2
- //
3
- // Permission is hereby granted, free of charge, to any person obtaining a copy
4
- // of this software and associated documentation files (the "Software"), to
5
- // deal in the Software without restriction, including without limitation the
6
- // rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
7
- // sell copies of the Software, and to permit persons to whom the Software is
8
- // furnished to do so, subject to the following conditions:
9
- //
10
- // The above copyright notice and this permission notice shall be included in
11
- // all copies or substantial portions of the Software.
12
- //
13
- // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
14
- // IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
15
- // FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
16
- // AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
17
- // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
18
- // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
19
- // IN THE SOFTWARE.
20
-
21
- #ifndef UNIX_ADAPTER_INPUT_HANDLER_H
22
- #define UNIX_ADAPTER_INPUT_HANDLER_H
23
-
24
- #include <windows.h>
25
- #include <pthread.h>
26
- #include <signal.h>
27
-
28
- #include "WakeupFd.h"
29
-
30
- // Connect a Cygwin blocking fd to winpty CONIN.
31
- class InputHandler {
32
- public:
33
- InputHandler(HANDLE conin, int inputfd, WakeupFd &completionWakeup);
34
- ~InputHandler() { shutdown(); }
35
- bool isComplete() { return m_threadCompleted; }
36
- void startShutdown() { m_shouldShutdown = 1; m_wakeup.set(); }
37
- void shutdown();
38
-
39
- private:
40
- static void *threadProcS(void *pvthis) {
41
- reinterpret_cast<InputHandler*>(pvthis)->threadProc();
42
- return NULL;
43
- }
44
- void threadProc();
45
-
46
- HANDLE m_conin;
47
- int m_inputfd;
48
- pthread_t m_thread;
49
- WakeupFd &m_completionWakeup;
50
- WakeupFd m_wakeup;
51
- bool m_threadHasBeenJoined;
52
- volatile sig_atomic_t m_shouldShutdown;
53
- volatile sig_atomic_t m_threadCompleted;
54
- };
55
-
56
- #endif // UNIX_ADAPTER_INPUT_HANDLER_H
@@ -1,80 +0,0 @@
1
- // Copyright (c) 2011-2015 Ryan Prichard
2
- //
3
- // Permission is hereby granted, free of charge, to any person obtaining a copy
4
- // of this software and associated documentation files (the "Software"), to
5
- // deal in the Software without restriction, including without limitation the
6
- // rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
7
- // sell copies of the Software, and to permit persons to whom the Software is
8
- // furnished to do so, subject to the following conditions:
9
- //
10
- // The above copyright notice and this permission notice shall be included in
11
- // all copies or substantial portions of the Software.
12
- //
13
- // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
14
- // IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
15
- // FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
16
- // AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
17
- // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
18
- // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
19
- // IN THE SOFTWARE.
20
-
21
- #include "OutputHandler.h"
22
-
23
- #include <assert.h>
24
- #include <errno.h>
25
- #include <sys/select.h>
26
- #include <unistd.h>
27
-
28
- #include <algorithm>
29
- #include <vector>
30
-
31
- #include "../shared/DebugClient.h"
32
- #include "Util.h"
33
- #include "WakeupFd.h"
34
-
35
- OutputHandler::OutputHandler(
36
- HANDLE conout, int outputfd, WakeupFd &completionWakeup) :
37
- m_conout(conout),
38
- m_outputfd(outputfd),
39
- m_completionWakeup(completionWakeup),
40
- m_threadHasBeenJoined(false),
41
- m_threadCompleted(0)
42
- {
43
- pthread_create(&m_thread, NULL, OutputHandler::threadProcS, this);
44
- }
45
-
46
- void OutputHandler::shutdown() {
47
- if (!m_threadHasBeenJoined) {
48
- int ret = pthread_join(m_thread, NULL);
49
- assert(ret == 0 && "pthread_join failed");
50
- m_threadHasBeenJoined = true;
51
- }
52
- }
53
-
54
- void OutputHandler::threadProc() {
55
- std::vector<char> buffer(4096);
56
- while (true) {
57
- DWORD numRead = 0;
58
- BOOL ret = ReadFile(m_conout,
59
- &buffer[0], buffer.size(),
60
- &numRead, NULL);
61
- if (!ret || numRead == 0) {
62
- if (!ret && GetLastError() == ERROR_BROKEN_PIPE) {
63
- trace("OutputHandler: pipe closed: numRead=%u",
64
- static_cast<unsigned int>(numRead));
65
- } else {
66
- trace("OutputHandler: read failed: "
67
- "ret=%d lastError=0x%x numRead=%u",
68
- ret,
69
- static_cast<unsigned int>(GetLastError()),
70
- static_cast<unsigned int>(numRead));
71
- }
72
- break;
73
- }
74
- if (!writeAll(m_outputfd, &buffer[0], numRead)) {
75
- break;
76
- }
77
- }
78
- m_threadCompleted = 1;
79
- m_completionWakeup.set();
80
- }
@@ -1,53 +0,0 @@
1
- // Copyright (c) 2011-2015 Ryan Prichard
2
- //
3
- // Permission is hereby granted, free of charge, to any person obtaining a copy
4
- // of this software and associated documentation files (the "Software"), to
5
- // deal in the Software without restriction, including without limitation the
6
- // rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
7
- // sell copies of the Software, and to permit persons to whom the Software is
8
- // furnished to do so, subject to the following conditions:
9
- //
10
- // The above copyright notice and this permission notice shall be included in
11
- // all copies or substantial portions of the Software.
12
- //
13
- // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
14
- // IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
15
- // FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
16
- // AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
17
- // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
18
- // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
19
- // IN THE SOFTWARE.
20
-
21
- #ifndef UNIX_ADAPTER_OUTPUT_HANDLER_H
22
- #define UNIX_ADAPTER_OUTPUT_HANDLER_H
23
-
24
- #include <windows.h>
25
- #include <pthread.h>
26
- #include <signal.h>
27
-
28
- #include "WakeupFd.h"
29
-
30
- // Connect winpty CONOUT/CONERR to a Cygwin blocking fd.
31
- class OutputHandler {
32
- public:
33
- OutputHandler(HANDLE conout, int outputfd, WakeupFd &completionWakeup);
34
- ~OutputHandler() { shutdown(); }
35
- bool isComplete() { return m_threadCompleted; }
36
- void shutdown();
37
-
38
- private:
39
- static void *threadProcS(void *pvthis) {
40
- reinterpret_cast<OutputHandler*>(pvthis)->threadProc();
41
- return NULL;
42
- }
43
- void threadProc();
44
-
45
- HANDLE m_conout;
46
- int m_outputfd;
47
- pthread_t m_thread;
48
- WakeupFd &m_completionWakeup;
49
- bool m_threadHasBeenJoined;
50
- volatile sig_atomic_t m_threadCompleted;
51
- };
52
-
53
- #endif // UNIX_ADAPTER_OUTPUT_HANDLER_H
@@ -1,86 +0,0 @@
1
- // Copyright (c) 2015 Ryan Prichard
2
- //
3
- // Permission is hereby granted, free of charge, to any person obtaining a copy
4
- // of this software and associated documentation files (the "Software"), to
5
- // deal in the Software without restriction, including without limitation the
6
- // rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
7
- // sell copies of the Software, and to permit persons to whom the Software is
8
- // furnished to do so, subject to the following conditions:
9
- //
10
- // The above copyright notice and this permission notice shall be included in
11
- // all copies or substantial portions of the Software.
12
- //
13
- // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
14
- // IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
15
- // FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
16
- // AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
17
- // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
18
- // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
19
- // IN THE SOFTWARE.
20
-
21
- #include "Util.h"
22
-
23
- #include <assert.h>
24
- #include <errno.h>
25
- #include <stdio.h>
26
- #include <string.h>
27
- #include <unistd.h>
28
-
29
- #include "../shared/DebugClient.h"
30
-
31
- // Write the entire buffer, restarting it as necessary.
32
- bool writeAll(int fd, const void *buffer, size_t size) {
33
- size_t written = 0;
34
- while (written < size) {
35
- int ret = write(fd,
36
- reinterpret_cast<const char*>(buffer) + written,
37
- size - written);
38
- if (ret == -1 && errno == EINTR) {
39
- continue;
40
- }
41
- if (ret <= 0) {
42
- trace("write failed: "
43
- "fd=%d errno=%d size=%u written=%d ret=%d",
44
- fd,
45
- errno,
46
- static_cast<unsigned int>(size),
47
- static_cast<unsigned int>(written),
48
- ret);
49
- return false;
50
- }
51
- assert(static_cast<size_t>(ret) <= size - written);
52
- written += ret;
53
- }
54
- assert(written == size);
55
- return true;
56
- }
57
-
58
- bool writeStr(int fd, const char *str) {
59
- return writeAll(fd, str, strlen(str));
60
- }
61
-
62
- void selectWrapper(const char *diagName, int nfds, fd_set *readfds) {
63
- int ret = select(nfds, readfds, NULL, NULL, NULL);
64
- if (ret < 0) {
65
- if (errno == EINTR) {
66
- FD_ZERO(readfds);
67
- return;
68
- }
69
- #ifdef WINPTY_TARGET_MSYS1
70
- // The select system call sometimes fails with EAGAIN instead of EINTR.
71
- // This apparantly only happens with the old Cygwin fork "MSYS" used in
72
- // the mingw.org project. select is not supposed to fail with EAGAIN,
73
- // and EAGAIN does not make much sense as an error code. (The whole
74
- // point of select is to block.)
75
- if (errno == EAGAIN) {
76
- trace("%s select returned EAGAIN: interpreting like EINTR",
77
- diagName);
78
- FD_ZERO(readfds);
79
- return;
80
- }
81
- #endif
82
- fprintf(stderr, "Internal error: %s select failed: "
83
- "error %d", diagName, errno);
84
- abort();
85
- }
86
- }
@@ -1,31 +0,0 @@
1
- // Copyright (c) 2015 Ryan Prichard
2
- //
3
- // Permission is hereby granted, free of charge, to any person obtaining a copy
4
- // of this software and associated documentation files (the "Software"), to
5
- // deal in the Software without restriction, including without limitation the
6
- // rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
7
- // sell copies of the Software, and to permit persons to whom the Software is
8
- // furnished to do so, subject to the following conditions:
9
- //
10
- // The above copyright notice and this permission notice shall be included in
11
- // all copies or substantial portions of the Software.
12
- //
13
- // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
14
- // IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
15
- // FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
16
- // AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
17
- // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
18
- // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
19
- // IN THE SOFTWARE.
20
-
21
- #ifndef UNIX_ADAPTER_UTIL_H
22
- #define UNIX_ADAPTER_UTIL_H
23
-
24
- #include <stdlib.h>
25
- #include <sys/select.h>
26
-
27
- bool writeAll(int fd, const void *buffer, size_t size);
28
- bool writeStr(int fd, const char *str);
29
- void selectWrapper(const char *diagName, int nfds, fd_set *readfds);
30
-
31
- #endif // UNIX_ADAPTER_UTIL_H
@@ -1,70 +0,0 @@
1
- // Copyright (c) 2011-2015 Ryan Prichard
2
- //
3
- // Permission is hereby granted, free of charge, to any person obtaining a copy
4
- // of this software and associated documentation files (the "Software"), to
5
- // deal in the Software without restriction, including without limitation the
6
- // rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
7
- // sell copies of the Software, and to permit persons to whom the Software is
8
- // furnished to do so, subject to the following conditions:
9
- //
10
- // The above copyright notice and this permission notice shall be included in
11
- // all copies or substantial portions of the Software.
12
- //
13
- // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
14
- // IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
15
- // FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
16
- // AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
17
- // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
18
- // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
19
- // IN THE SOFTWARE.
20
-
21
- #include "WakeupFd.h"
22
-
23
- #include <errno.h>
24
- #include <fcntl.h>
25
- #include <stdio.h>
26
- #include <stdlib.h>
27
- #include <unistd.h>
28
-
29
- static void setFdNonBlock(int fd) {
30
- int status = fcntl(fd, F_GETFL);
31
- fcntl(fd, F_SETFL, status | O_NONBLOCK);
32
- }
33
-
34
- WakeupFd::WakeupFd() {
35
- int pipeFd[2];
36
- if (pipe(pipeFd) != 0) {
37
- perror("Could not create internal wakeup pipe");
38
- abort();
39
- }
40
- m_pipeReadFd = pipeFd[0];
41
- m_pipeWriteFd = pipeFd[1];
42
- setFdNonBlock(m_pipeReadFd);
43
- setFdNonBlock(m_pipeWriteFd);
44
- }
45
-
46
- WakeupFd::~WakeupFd() {
47
- close(m_pipeReadFd);
48
- close(m_pipeWriteFd);
49
- }
50
-
51
- void WakeupFd::set() {
52
- char dummy = 0;
53
- int ret;
54
- do {
55
- ret = write(m_pipeWriteFd, &dummy, 1);
56
- } while (ret < 0 && errno == EINTR);
57
- }
58
-
59
- void WakeupFd::reset() {
60
- char tmpBuf[256];
61
- while (true) {
62
- int amount = read(m_pipeReadFd, tmpBuf, sizeof(tmpBuf));
63
- if (amount < 0 && errno == EAGAIN) {
64
- break;
65
- } else if (amount <= 0) {
66
- perror("error reading from internal wakeup pipe");
67
- abort();
68
- }
69
- }
70
- }