|
|
@@ -359,12 +359,9 @@ namespace CodeDweller { |
|
|
|
bool errorOccurred = false;
|
|
|
|
|
|
|
|
#ifdef _WIN32
|
|
|
|
if (!TerminateProcess(childProcess, terminateExitCode)) {
|
|
|
|
errorString += (errorOccurred ? "\n" : "");
|
|
|
|
errorString += "Error terminating the child process: " +
|
|
|
|
getErrorText();
|
|
|
|
errorOccurred = true;
|
|
|
|
}
|
|
|
|
// Ignore errors. Reason: Terminating a proces that doesn't
|
|
|
|
// exist (e.g. has exited) gives an error.
|
|
|
|
(void) TerminateProcess(childProcess, terminateExitCode);
|
|
|
|
#else
|
|
|
|
if (kill(childPid, SIGKILL) != 0) {
|
|
|
|
errorString += (errorOccurred ? "\n" : "");
|
|
|
@@ -997,22 +994,19 @@ namespace CodeDweller { |
|
|
|
bool errorOccurred = false;
|
|
|
|
|
|
|
|
#ifdef _WIN32
|
|
|
|
if (!CloseHandle(inputHandle)) {
|
|
|
|
// Ignore errors. Reason: Terminating a proces that doesn't
|
|
|
|
// exist (e.g. has exited) gives an error.
|
|
|
|
(void) TerminateProcess(childProcess, terminateExitCode);
|
|
|
|
|
|
|
|
if (CloseHandle(inputHandle) == 0) {
|
|
|
|
errorString = "Error closing input from the child: " + getErrorText();
|
|
|
|
errorOccurred = true;
|
|
|
|
}
|
|
|
|
if (!CloseHandle(outputHandle)) {
|
|
|
|
if (CloseHandle(outputHandle) == 0) {
|
|
|
|
errorString += (errorOccurred ? "\n" : "");
|
|
|
|
errorString += "Error closing output to the child: " + getErrorText();
|
|
|
|
errorOccurred = true;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!TerminateProcess(childProcess, terminateExitCode)) {
|
|
|
|
errorString += (errorOccurred ? "\n" : "");
|
|
|
|
errorString += "Error terminating the child process: " +
|
|
|
|
getErrorText();
|
|
|
|
errorOccurred = true;
|
|
|
|
}
|
|
|
|
#else
|
|
|
|
if (0 != ::close(inputFileDescriptor)) {
|
|
|
|
errorString = "Error closing input from the child: " + getErrorText();
|
|
|
@@ -1044,11 +1038,9 @@ namespace CodeDweller { |
|
|
|
}
|
|
|
|
|
|
|
|
if (threadsAreRunning) {
|
|
|
|
|
|
|
|
readerThread.join();
|
|
|
|
writerThread.join();
|
|
|
|
threadsAreRunning = false;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
// Reset.
|
|
|
@@ -1484,9 +1476,16 @@ namespace CodeDweller { |
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
errorText = "Error reading from the child process: ";
|
|
|
|
errorText += getErrorText();
|
|
|
|
break;
|
|
|
|
// Broken pipe occurs when the child exits; this is not
|
|
|
|
// necessarily an error condition.
|
|
|
|
if (GetLastError() != ERROR_BROKEN_PIPE) {
|
|
|
|
|
|
|
|
errorText = "Error reading from the child process: ";
|
|
|
|
errorText += getErrorText();
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
}
|
|
|
|
#else
|