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.)

1 files changed, 5 insertions, 3 deletions

diff --git a/lib/vty_io_file.c b/lib/vty_io_file.c
index 2322114a..01a92a2d 100644
--- a/lib/vty_io_file.c
+++ b/lib/vty_io_file.c
@@ -368,12 +368,12 @@ uty_fifo_command_line(vio_vf vf, cmd_action action)
   while (1)
     {
       char* s, * p, * e ;
-      size_t  have ;
+      ulen    have ;
       ulen    len ;
       bool    eol ;
 
       /* Get what we can from the fifo                                  */
-      s = vio_fifo_get(vf->ibuf, &have) ;
+      have = vio_fifo_get(vf->ibuf) ;
 
       /* If fifo is empty, may be last line before eof, eof or waiting  */
       if (have == 0)
@@ -399,7 +399,7 @@ uty_fifo_command_line(vio_vf vf, cmd_action action)
        * This means that we cope with "\r\n" line terminators.  But not
        * anything more exotic.
        */
-      p = s ;
+      p = s = vio_fifo_get_ptr(vf->ibuf) ;
       e = s + have ;       /* have != 0    */
 
       eol = false ;
@@ -956,6 +956,8 @@ uty_pipe_open_complete(vio_vf vf, pid_t pid, int ret_fd, vio_vf slave)
   if (!vf->blocking)
     vio_vfd_set_read_action(vf->pr_vfd, uty_pipe_return_ready) ;
 
+  vio_vfd_set_read_timeout_action(vf->pr_vfd, uty_pipe_return_timeout) ;
+
   /* Configure master/slave relationship.                               */
   slave->pr_master  = vf ;
   vf->pr_slave      = slave ;