diff options
| author | Chris Hall <chris.hall@highwayman.com> | 2011-07-21 19:53:02 +0100 |
|---|---|---|
| committer | Chris Hall <chris.hall@highwayman.com> | 2011-07-21 19:53:02 +0100 |
| commit | 56da2a1c9b6361e302b7a39fe2740561a9012d88 (patch) | |
| tree | 6b6543532133a0c618d0f4ec70a87cf3f96caf30 /lib/vty_io_file.h | |
| parent | e535bc959729262480a9702e71334002edee3f8c (diff) | |
| download | quagga-56da2a1c9b6361e302b7a39fe2740561a9012d88.tar.bz2 quagga-56da2a1c9b6361e302b7a39fe2740561a9012d88.tar.xz | |
Update pipework and improve memory reporting.
Improve error handling for all new pipework inputs and outputs.
Change behaviour of ^C from VTY Terminal, so that will interrupt
output and terminate all running pipes -- including running
shell commands.
In pipe commands, recognise "~/..." and "~user/..." home directory
forms.
Changed "~/" to mean the usual home for the current user. "~~/"
now means the configuration file directory.
Introduced "shdir DIR" command to show what is (currently) what.
Changed "<|" so that if the command has a path, it is expanded
using Quagga's rules (including "~~/" and "~./") and the
"here" directory is set to that path.
Fixed collection of stderr output from all pipes so that is
separate from stdout output, and is always sent to the base
output (eg VTY Terminal).
Increase amount of information about the heap that "show mem"
shows -- particularly if the "memory_tracker" is enabled.
Tested and applied resulting fixes.
Diffstat (limited to 'lib/vty_io_file.h')
| -rw-r--r-- | lib/vty_io_file.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/lib/vty_io_file.h b/lib/vty_io_file.h index 5bb5a607..701be801 100644 --- a/lib/vty_io_file.h +++ b/lib/vty_io_file.h @@ -45,26 +45,26 @@ extern cmd_return_code_t uty_config_read_close(vio_vf vf, bool final) ; extern cmd_return_code_t uty_file_read_open(vty_io vio, qstring name, cmd_context context) ; extern cmd_return_code_t uty_file_write_open(vty_io vio, qstring name, - bool append, cmd_context context) ; + bool append, cmd_context context, bool after) ; extern cmd_return_code_t uty_file_fetch_command_line(vio_vf vf, cmd_action action) ; -extern cmd_return_code_t uty_file_out_push(vio_vf vf, bool final) ; +extern cmd_return_code_t uty_file_out_push(vio_vf vf, bool final, bool all) ; extern cmd_return_code_t uty_file_read_close(vio_vf vf, bool final) ; -extern cmd_return_code_t uty_file_write_close(vio_vf vf, bool final, bool base) ; +extern cmd_return_code_t uty_file_write_close(vio_vf vf, bool final) ; extern cmd_return_code_t uty_pipe_read_open(vty_io vio, qstring command, cmd_context context) ; extern cmd_return_code_t uty_pipe_write_open(vty_io vio, qstring command, - bool shell_only) ; + bool shell_cmd, bool after) ; extern cmd_return_code_t uty_pipe_fetch_command_line(vio_vf vf, cmd_action action) ; extern cmd_return_code_t uty_pipe_out_push(vio_vf vf, bool final) ; -extern void uty_pipe_return_slave_ready(vio_vf slave) ; extern cmd_return_code_t uty_pipe_read_close(vio_vf vf, bool final) ; -extern cmd_return_code_t uty_pipe_write_close(vio_vf vf, bool final, bool base, - bool shell_only) ; +extern cmd_return_code_t uty_pipe_write_close(vio_vf vf, bool final) ; +extern void uty_pipe_return_stop(vio_vf vf) ; +extern void uty_pipe_return_cancel(vio_vf vf) ; #endif |