@@ -3251,18 +3251,17 @@ void execute_system_shell_and_exit(char *x)
32513251// For some reason if system is invoked when sh is not available the program seg faults.
32523252// This is avoided by ifdef'ing out the system() call in favor of exec of cmd.exe on Windows.
32533253#ifndef __CYGWIN
3254- int ret = system (x); // second child runs
3255- if (ret == -1 ) {
3256- WARNING (" system call error for %s" ,x);
3257- }
3258- TRACE_MSG (" Exec of '%s' returned %d" , x, WEXITSTATUS (ret));
3259- exit (WEXITSTATUS (ret));
3260-
3254+ int ret = system (x); // second child runs
3255+ if (ret == -1 ) {
3256+ WARNING (" system call error for %s" ,x);
3257+ }
3258+ TRACE_MSG (" Exec of '%s' returned %d" , x, WEXITSTATUS (ret));
3259+ exit (WEXITSTATUS (ret));
32613260
32623261#else
3263- // sh not available, use exec(command)
3264- int ret = execlp (" cmd.exe" , " cmd.exe" , " /c" , x, (char *) NULL );
3265- ERROR_NO (" Exec of 'cmd.exe /c %s' failed" , x);
3262+ // sh not available, use exec(command)
3263+ int ret = execlp (" cmd.exe" , " cmd.exe" , " /c" , x, (char *) NULL );
3264+ ERROR_NO (" Exec of 'cmd.exe /c %s' failed" , x);
32663265#endif
32673266
32683267}
@@ -3696,7 +3695,7 @@ call::T_ActionResult call::executeAction(const char* msg, message* curmsg)
36963695 char * x = createSendingMessage (currentAction->getMessage (), -2 /* do not add crlf*/ );
36973696 ERROR (" %s" , x);
36983697 } else if ((currentAction->getActionType () == CAction::E_AT_EXECUTE_CMD) ||
3699- (currentAction->getActionType () == CAction::E_AT_VERIFY_CMD)) {
3698+ (currentAction->getActionType () == CAction::E_AT_VERIFY_CMD)) {
37003699 char * x = createSendingMessage (currentAction->getMessage (), -2 /* do not add crlf*/ );
37013700 bool verify_result = (currentAction->getActionType () == CAction::E_AT_VERIFY_CMD);
37023701
0 commit comments