<br> - Retrieve option from tree before using it;<br> - Invert conditions since we now use streqv.<br>---<br> src/augrun.c | 8 ++++++--<br> 1 files changed, 6 insertions(+), 2 deletions(-)<br><br>diff --git a/src/augrun.c b/src/augrun.c<br>
index 636b6fe..901c150 100644<br>--- a/src/augrun.c<br>+++ b/src/augrun.c<br>@@ -621,13 +621,17 @@ static void cmd_span(struct command *cmd) {<br> char *filename = NULL;<br> const char *option = NULL;<br><br>- if (! streqv(AUG_DISABLE, option)) {<br>
+ if (aug_get(cmd->aug, AUGEAS_SPAN_OPTION, &option) != 1) {<br>+ printf("Error: option " AUGEAS_SPAN_OPTION " not found\n");<br>+ return;<br>+ }<br>+ if (streqv(AUG_DISABLE, option)) {<br>
ERR_REPORT(cmd, AUG_ECMDRUN,<br> "Span is not enabled. To enable, run the commands:\n"<br> " set %s %s\n rm %s\n load\n",<br> AUGEAS_SPAN_OPTION, AUG_ENABLE, AUGEAS_FILES_TREE);<br>
return;<br>- } else if (streqv(AUG_ENABLE, option)) {<br>+ } else if (! streqv(AUG_ENABLE, option)) {<br> ERR_REPORT(cmd, AUG_ECMDRUN,<br> "option %s must be %s or %s\n", AUGEAS_SPAN_OPTION,<br>
AUG_ENABLE, AUG_DISABLE);<br>-- <br>1.7.0.4<br><br>