version 1.70, 2007/09/17 10:22:30 |
version 1.71, 2007/09/17 10:28:48 |
|
|
if (shutUp) { |
if (shutUp) { |
if (!(job->flags & JOB_SILENT) && !noSpecials && |
if (!(job->flags & JOB_SILENT) && !noSpecials && |
commandShell->hasEchoCtl) { |
commandShell->hasEchoCtl) { |
DBPRINTF(job, "%s\n", commandShell->echoOff); |
DBPRINTF(job, "%s\n", SHELL_ECHO_OFF); |
} else { |
} else { |
shutUp = false; |
shutUp = false; |
} |
} |
|
|
*/ |
*/ |
if (!(job->flags & JOB_SILENT) && !shutUp && |
if (!(job->flags & JOB_SILENT) && !shutUp && |
commandShell->hasEchoCtl) { |
commandShell->hasEchoCtl) { |
DBPRINTF(job, "%s\n", commandShell->echoOff); |
DBPRINTF(job, "%s\n", SHELL_ECHO_OFF); |
DBPRINTF(job, "%s\n", commandShell->ignErr); |
DBPRINTF(job, "%s\n", SHELL_ERROR_OFF); |
DBPRINTF(job, "%s\n", commandShell->echoOn); |
DBPRINTF(job, "%s\n", SHELL_ECHO_ON); |
} else { |
} else { |
DBPRINTF(job, "%s\n", commandShell->ignErr); |
DBPRINTF(job, "%s\n", SHELL_ERROR_OFF); |
} |
} |
} else if (commandShell->ignErr && |
} else if (commandShell->ignErr && |
(*commandShell->ignErr != '\0')) { |
(*commandShell->ignErr != '\0')) { |
|
|
*/ |
*/ |
if (!(job->flags & JOB_SILENT) && !shutUp && |
if (!(job->flags & JOB_SILENT) && !shutUp && |
commandShell->hasEchoCtl) { |
commandShell->hasEchoCtl) { |
DBPRINTF(job, "%s\n", commandShell->echoOff); |
DBPRINTF(job, "%s\n", SHELL_ECHO_OFF); |
DBPRINTF(job, commandShell->errCheck, cmd); |
DBPRINTF(job, SHELL_ERROR_ON, cmd); |
shutUp = true; |
shutUp = true; |
} |
} |
cmdTemplate = commandShell->ignErr; |
cmdTemplate = SHELL_ERROR_OFF; |
/* |
/* |
* The error ignoration (hee hee) is already |
* The error ignoration (hee hee) is already |
* taken care of by the ignErr template, so |
* taken care of by the ignErr template, so |
|
|
*/ |
*/ |
if (!shutUp && !(job->flags & JOB_SILENT) && |
if (!shutUp && !(job->flags & JOB_SILENT) && |
commandShell->hasEchoCtl){ |
commandShell->hasEchoCtl){ |
DBPRINTF(job, "%s\n", commandShell->echoOff); |
DBPRINTF(job, "%s\n", SHELL_ECHO_OFF); |
shutUp = true; |
shutUp = true; |
} |
} |
DBPRINTF(job, "%s\n", commandShell->errCheck); |
DBPRINTF(job, "%s\n", SHELL_ERROR_ON); |
} |
} |
if (shutUp) { |
if (shutUp) { |
DBPRINTF(job, "%s\n", commandShell->echoOn); |
DBPRINTF(job, "%s\n", SHELL_ECHO_ON); |
} |
} |
return 1; |
return 1; |
} |
} |