Merge remote-tracking branch 'frr/master' into newline-redux

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>

diff --cc bgpd/bgp_route.c
index 6fd959e30487316139bceb7a934d998fd7f72e45,6b38ba68560c61f96e13d7bd87ad191c00640639..c2694b82bbd131ff0ce648c1d6c8a28a50f93441
--- 1/bgpd/bgp_route.c
--- 2/bgpd/bgp_route.c
+++ b/bgpd/bgp_route.c
@@@ -8063,9 -8064,10 +8063,10 @@@ bgp_show (struct vty *vty, struct bgp *
    if (bgp == NULL)
      {
        if (!use_json)
 -        vty_outln (vty, "No BGP process is configured");
 +        vty_out (vty, "No BGP process is configured\n");
        return CMD_WARNING;
      }
+ 
    /* use MPLS and ENCAP specific shows until they are merged */
    if (safi == SAFI_MPLS_VPN) 
      {
@@@ -9172,14 -9182,21 +9180,21 @@@ bgp_table_stats (struct vty *vty, struc
  {
    struct bgp_table_stats ts;
    unsigned int i;
-   
+ 
    if (!bgp->rib[afi][safi])
      {
 -      vty_outln (vty, "%% No RIB exist's for the AFI(%d)/SAFI(%d)",
 +      vty_out (vty, "%% No RIB exist's for the AFI(%d)/SAFI(%d)\n",
               afi, safi);
        return CMD_WARNING;
      }
-   
+ 
 -  vty_outln (vty, "BGP %s RIB statistics%s",
 -           afi_safi_print (afi, safi), VTYNL);
++  vty_out (vty, "BGP %s RIB statistics\n",
++           afi_safi_print (afi, safi));
+ 
+   /* labeled-unicast routes live in the unicast table */
+   if (safi == SAFI_LABELED_UNICAST)
+     safi = SAFI_UNICAST;
+ 
    memset (&ts, 0, sizeof (ts));
    ts.table = bgp->rib[afi][safi];
    thread_execute (bm->master, bgp_table_stats_walker, &ts, 0);

diff --cc bgpd/bgp_routemap.c
Simple merge

diff --cc bgpd/bgp_vty.c
Simple merge

diff --cc lib/command.c
Simple merge

diff --cc lib/vty.c
index 80714597ac3b29ea1d3784dffad19db19c970471,2c25bd2fc3e504a385f381e2ff15d851f941fb6c..9439e38834c0687c4827df46da90db3bb024237d
--- 1/lib/vty.c
--- 2/lib/vty.c
+++ b/lib/vty.c
@@@ -1116,17 -1134,13 +1116,13 @@@ vty_describe_command (struct vty *vty
              vector varcomps = vector_init (VECTOR_MIN_SIZE);
              cmd_variable_complete (token, ref, varcomps);
  
-             if (vector_active(varcomps) > 0)
+             if (vector_active (varcomps) > 0)
                {
-                 vty_out(vty, "     ");
-                 for (size_t j = 0; j < vector_active (varcomps); j++)
-                   {
-                     char *item = vector_slot (varcomps, j);
-                     vty_out(vty, " %s", item);
-                     XFREE(MTYPE_COMPLETION, item);
-                   }
-                 vty_out (vty, "\n");
 -                char *ac = cmd_variable_comp2str(varcomps, vty->width, VTYNL);
 -                vty_outln(vty, "%s", ac);
++                char *ac = cmd_variable_comp2str(varcomps, vty->width, "\n");
++                vty_out(vty, "%s\n", ac);
+                 XFREE(MTYPE_TMP, ac);
                }
+ 
              vector_free(varcomps);
            }
  #if 0

diff --cc vtysh/vtysh.c
Simple merge