version 1.123, 2016/10/05 12:32:13 |
version 1.124, 2016/10/13 10:01:49 |
|
|
current = &parent->state.tflag; |
current = &parent->state.tflag; |
else if (c == 's') |
else if (c == 's') |
current = &parent->state.sflag; |
current = &parent->state.sflag; |
} else { |
} |
|
if (current == NULL || !cmd_find_valid_state(current)) { |
error = cmd_find_current(&tmp, cmdq, targetflags); |
error = cmd_find_current(&tmp, cmdq, targetflags); |
if (error != 0 && ~targetflags & CMD_FIND_QUIET) |
if (error != 0 && ~targetflags & CMD_FIND_QUIET) |
return (-1); |
return (-1); |
current = &tmp; |
current = &tmp; |
} |
} |
|
if (!cmd_find_empty_state(current) && !cmd_find_valid_state(current)) |
|
fatalx("invalid current state"); |
|
|
switch (flag) { |
switch (flag) { |
case CMD_NONE: |
case CMD_NONE: |
|
|
error = cmd_prepare_state_flag('s', s, entry->sflag, cmdq, parent); |
error = cmd_prepare_state_flag('s', s, entry->sflag, cmdq, parent); |
if (error != 0) |
if (error != 0) |
return (error); |
return (error); |
|
|
|
if (!cmd_find_empty_state(&state->tflag) && |
|
!cmd_find_valid_state(&state->tflag)) |
|
fatalx("invalid -t state"); |
|
if (!cmd_find_empty_state(&state->sflag) && |
|
!cmd_find_valid_state(&state->sflag)) |
|
fatalx("invalid -s state"); |
|
|
return (0); |
return (0); |
} |
} |