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_basic.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_basic.h')
| -rw-r--r-- | lib/vty_io_basic.h | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/lib/vty_io_basic.h b/lib/vty_io_basic.h index 9d174fdd..cbeb9fed 100644 --- a/lib/vty_io_basic.h +++ b/lib/vty_io_basic.h @@ -54,14 +54,16 @@ typedef enum vfd_type vfd_type_t ; enum vfd_io_type /* NB: *bit*significant* */ { - vfd_io_none = 0, + vfd_io_none = 0, - vfd_io_read = BIT(0), - vfd_io_write = BIT(1), - vfd_io_read_write = vfd_io_read | vfd_io_write, + vfd_io_read = BIT(0), + vfd_io_write = BIT(1), + vfd_io_read_write = vfd_io_read | vfd_io_write, - vfd_io_append = BIT(2), - vfd_io_blocking = BIT(3), + vfd_io_append = BIT(2), + vfd_io_blocking = BIT(3), + + vfd_io_ps_blocking = BIT(4), } ; typedef enum vfd_io_type vfd_io_type_t ; @@ -183,8 +185,8 @@ struct vio_listener /*============================================================================== * Functions */ - -extern int uty_vfd_file_open(const char* name, vfd_io_type_t io_type) ; +extern int uty_fd_file_open(const char* name, vfd_io_type_t io_type, + mode_t cmode) ; extern vio_vfd vio_vfd_new(int fd, vfd_type_t type, vfd_io_type_t io_type, void* action_info) ; |