diff options
| author | Chris Hall <chris.hall@highwayman.com> | 2011-09-06 23:43:26 +0100 |
|---|---|---|
| committer | Chris Hall <chris.hall@highwayman.com> | 2011-09-06 23:43:26 +0100 |
| commit | 44b5aa5ca8b8a1620478c794dae11a7d71e9211e (patch) | |
| tree | 00e10e01b36e4452173ffd15c7b1a5ec42dfbc0c /lib/command_parse.h | |
| parent | 1c1a79f1119c8bc898fb96ec385381f61841d7a1 (diff) | |
| download | quagga-44b5aa5ca8b8a1620478c794dae11a7d71e9211e.tar.bz2 quagga-44b5aa5ca8b8a1620478c794dae11a7d71e9211e.tar.xz | |
Further improvements to "pipework".ex19p
Version advanced to 0.99.18ex19p.
Fixed occasional failure to immediately display prompt after
previous command output was abandonned by ^C, particularly with
"--more--".
Completely removed the "~" temporary prompt, and simplified some
logic.
Added indication of pthread running to "show version".
Diffstat (limited to 'lib/command_parse.h')
| -rw-r--r-- | lib/command_parse.h | 27 |
1 files changed, 16 insertions, 11 deletions
diff --git a/lib/command_parse.h b/lib/command_parse.h index ab93f061..42fac7c0 100644 --- a/lib/command_parse.h +++ b/lib/command_parse.h @@ -476,15 +476,18 @@ enum cmd_pipe_type /* bit significant */ cmd_pipe_file = BIT(0), cmd_pipe_shell = BIT(1), - cmd_pipe_dev_null = BIT(2), /* out pipe only -- black hole */ + cmd_pipe_dev_null = BIT(2), /* out pipe only -- black hole */ - /* For in pipes */ - cmd_pipe_reflect = BIT(4), /* + option */ + /* For in pipes + */ + cmd_pipe_reflect = BIT(4), /* + option */ - /* For out file pipes */ + /* For out file pipes + */ cmd_pipe_append = BIT(4), /* >> */ - /* For out shell pipes */ + /* For out shell pipes + */ cmd_pipe_shell_cmd = BIT(4), /* | at start of line */ } ; typedef enum cmd_pipe_type cmd_pipe_type_t ; @@ -494,15 +497,17 @@ enum cmd_parts /* bit significant */ { cmd_parts_none = 0, - cmd_part_do = BIT(0), - cmd_part_command = BIT(1), + cmd_part_do = BIT(0), /* command has leading "do" */ + cmd_part_command = BIT(1), /* command part exists */ + + cmd_part_in_pipe = BIT(2), /* in pipe part exists */ + cmd_part_out_pipe = BIT(3), /* out pipe part exists */ - cmd_part_in_pipe = BIT(2), - cmd_part_out_pipe = BIT(3), + cmd_parts_pipe = cmd_part_in_pipe | cmd_part_out_pipe, - cmd_parts_pipe = (cmd_part_in_pipe | cmd_part_out_pipe), + cmd_parts_execute = cmd_part_command | cmd_parts_pipe, - cmd_part_comment = BIT(4), + cmd_part_comment = BIT(4), /* commend part exists */ } ; typedef enum cmd_parts cmd_parts_t ; |