summaryrefslogtreecommitdiffstats
path: root/lib/vty_command.c
diff options
context:
space:
mode:
authorChris Hall <chris.hall@highwayman.com>2011-03-29 01:49:16 +0100
committerChris Hall <chris.hall@highwayman.com>2011-03-29 01:49:16 +0100
commitf9956b9524ddafdb9d0cec042213eaa8229aad8c (patch)
treebf362c892837ef3f5a6a4d4265eb18e1b47ccf33 /lib/vty_command.c
parent9470cb2c32eab220f796b1438b787528272cbe84 (diff)
downloadquagga-ex15p.tar.bz2
quagga-ex15p.tar.xz
Bring "ex" version up to date with 0.99.18ex15p
Release: 0.99.18ex15p -- Pipework Branch Also fixes issue with unknown attributes -- does not release them prematurely. Contains the "bgpd: New show commands for improved view and address family support", which is post 0.99.18. (But not RFC 5082 GTSM.)
Diffstat (limited to 'lib/vty_command.c')
-rw-r--r--lib/vty_command.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/vty_command.c b/lib/vty_command.c
index 0ce31fdf..9aebc50f 100644
--- a/lib/vty_command.c
+++ b/lib/vty_command.c
@@ -1026,7 +1026,7 @@ uty_cmd_hiatus(vty_io vio, cmd_return_code_t ret)
if (vio->ebuf != NULL)
{
vio_fifo_copy(vio->obuf, vio->ebuf) ;
- vio->ebuf = vio_fifo_reset(vio->ebuf, free_it) ;
+ vio->ebuf = vio_fifo_free(vio->ebuf) ;
ret = uty_cmd_out_push(vio->vout, vio->err_hard) ;
@@ -1351,9 +1351,9 @@ vty_cmd_success(vty vty)
if (!vio_fifo_tail_empty(vio->obuf))
{
if (!vty->exec->out_suppress)
- ret = uty_cmd_out_push(vio->vout, false) ; /* not final */
+ ret = uty_cmd_out_push(vio->vout, false) ; /* not final */
else
- uty_out_clear(vio) ;
+ vio_fifo_back_to_end_mark(vio->obuf, true) ; /* keep end mark */
} ;
} ;
@@ -1526,7 +1526,7 @@ uty_cmd_failed(vty_io vio, cmd_return_code_t ret)
if (vio->ebuf != NULL)
vio_fifo_clear(vio->ebuf, true) ;
else
- vio->ebuf = vio_fifo_init_new(NULL, 1000) ;
+ vio->ebuf = vio_fifo_new(1000) ;
indent = uty_show_error_context(vio->ebuf, vio->vin) ;