d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix handling of the 'noError' variable. According to the code comments,

Browse Source 
one can set the 'noError' variable to ignore any errors that occur for the
next command.  However, the code was only unsetting 'noError' when an error
actually occurred, so if you set 'noError', the next command completed ok,
and the command after that failed, the second command's failure would be
ignored.  This fixes this by performing the 'noError' check earlier and
then unsetting 'noError' after every command that is run.

Sponsored by:	The Weather Channel
This commit is contained in:
jhb 2002-06-03 19:42:49 +00:00
parent 3566425519
commit f21ffaa690
2 changed files with 22 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
usr.sbin/sade/dispatch.c
View File

@ -263,6 +263,13 @@ dispatchCommand(char *str)
msgNotify("Warning: No such command ``%s''", str);
i = DITEM_FAILURE;
}
/*
* Allow a user to prefix a command with "noError" to cause
* us to ignore any errors for that one command.
*/
if (i != DITEM_SUCCESS && variable_get(VAR_NO_ERROR))
i = DITEM_SUCCESS;
variable_unset(VAR_NO_ERROR);
}
return i;
}
@ -320,18 +327,10 @@ dispatch_execute(qelement *head)
item = (command_buffer *) head->q_forw;
if (DITEM_STATUS(dispatchCommand(item->string)) != DITEM_SUCCESS) {
/*
* Allow a user to prefix a command with "noError" to cause
* us to ignore any errors for that one command.
*/
if (variable_get(VAR_NO_ERROR))
variable_unset(VAR_NO_ERROR);
else {
msgConfirm("Command `%s' failed - rest of script aborted.\n",
item->string);
result |= DITEM_FAILURE;
break;
}
msgConfirm("Command `%s' failed - rest of script aborted.\n",
item->string);
result |= DITEM_FAILURE;
break;
}
dispatch_free_command(item);
}

23
usr.sbin/sysinstall/dispatch.c
View File

@ -263,6 +263,13 @@ dispatchCommand(char *str)
msgNotify("Warning: No such command ``%s''", str);
i = DITEM_FAILURE;
}
/*
* Allow a user to prefix a command with "noError" to cause
* us to ignore any errors for that one command.
*/
if (i != DITEM_SUCCESS && variable_get(VAR_NO_ERROR))
i = DITEM_SUCCESS;
variable_unset(VAR_NO_ERROR);
}
return i;
}
@ -320,18 +327,10 @@ dispatch_execute(qelement *head)
item = (command_buffer *) head->q_forw;
if (DITEM_STATUS(dispatchCommand(item->string)) != DITEM_SUCCESS) {
/*
* Allow a user to prefix a command with "noError" to cause
* us to ignore any errors for that one command.
*/
if (variable_get(VAR_NO_ERROR))
variable_unset(VAR_NO_ERROR);
else {
msgConfirm("Command `%s' failed - rest of script aborted.\n",
item->string);
result |= DITEM_FAILURE;
break;
}
msgConfirm("Command `%s' failed - rest of script aborted.\n",
item->string);
result |= DITEM_FAILURE;
break;
}
dispatch_free_command(item);
}