Commit 29096513 authored by Robert Maynard's avatar Robert Maynard Committed by Brad King
Browse files

Process: Prefer normative terms to express subprocess failures

parent 31d59271
......@@ -2128,17 +2128,17 @@ static void kwsysProcessSetExitExceptionByIndex(kwsysProcess* cp, int sig,
#endif
#ifdef SIGABRT
case SIGABRT:
KWSYSPE_CASE(Other, "Child aborted");
KWSYSPE_CASE(Other, "Subprocess aborted");
break;
#endif
#ifdef SIGKILL
case SIGKILL:
KWSYSPE_CASE(Other, "Child killed");
KWSYSPE_CASE(Other, "Subprocess killed");
break;
#endif
#ifdef SIGTERM
case SIGTERM:
KWSYSPE_CASE(Other, "Child terminated");
KWSYSPE_CASE(Other, "Subprocess terminated");
break;
#endif
#ifdef SIGHUP
......
......@@ -450,24 +450,25 @@ static int runChild2(kwsysProcess* kp, const char* cmd[], int state,
printf("The process is still executing.\n");
break;
case kwsysProcess_State_Expired:
printf("Child was killed when timeout expired.\n");
printf("Subprocess was killed when timeout expired.\n");
break;
case kwsysProcess_State_Exited:
printf("Child exited with value = %d\n", kwsysProcess_GetExitValue(kp));
printf("Subprocess exited with value = %d\n",
kwsysProcess_GetExitValue(kp));
result = ((exception != kwsysProcess_GetExitException(kp)) ||
(value != kwsysProcess_GetExitValue(kp)));
break;
case kwsysProcess_State_Killed:
printf("Child was killed by parent.\n");
printf("Subprocess was killed by parent.\n");
break;
case kwsysProcess_State_Exception:
printf("Child terminated abnormally: %s\n",
printf("Subprocess terminated abnormally: %s\n",
kwsysProcess_GetExceptionString(kp));
result = ((exception != kwsysProcess_GetExitException(kp)) ||
(value != kwsysProcess_GetExitValue(kp)));
break;
case kwsysProcess_State_Disowned:
printf("Child was disowned.\n");
printf("Subprocess was disowned.\n");
break;
case kwsysProcess_State_Error:
printf("Error in administrating child process: [%s]\n",
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment