Second tranche of updates for pipework branch.

	modified:   bgpd/bgp_connection.c
	modified:   bgpd/bgp_debug.c
	modified:   bgpd/bgp_engine.h
	modified:   bgpd/bgp_main.c
	modified:   bgpd/bgp_packet.c
	modified:   bgpd/bgp_peer.c
	modified:   bgpd/bgp_route.c
	modified:   bgpd/bgp_routemap.c
	modified:   bgpd/bgp_session.c
	modified:   bgpd/bgp_vty.c
	modified:   bgpd/bgpd.c
	modified:   bgpd/bgpd.h
	modified:   configure.ac
	modified:   isisd/dict.h
	modified:   isisd/isis_misc.c
	modified:   isisd/isis_routemap.c
	modified:   isisd/isis_spf.c
	modified:   lib/Makefile.am
	modified:   lib/command.c
	modified:   lib/command.h
	modified:   lib/command_execute.h
	modified:   lib/command_parse.c
	modified:   lib/command_parse.h
	modified:   lib/command_queue.c
	modified:   lib/command_queue.h
	modified:   lib/elstring.h
	modified:   lib/heap.c
	modified:   lib/if.c
	modified:   lib/if.h
	modified:   lib/keychain.c
	modified:   lib/keystroke.c
	modified:   lib/keystroke.h
	modified:   lib/list_util.c
	modified:   lib/list_util.h
	modified:   lib/log.c
	modified:   lib/log.h
	modified:   lib/memory.c
	modified:   lib/memory.h
	modified:   lib/memtypes.c
	modified:   lib/misc.h
	modified:   lib/mqueue.c
	modified:   lib/mqueue.h
	deleted:    lib/node_type.h
	modified:   lib/pthread_safe.c
	modified:   lib/qfstring.c
	modified:   lib/qiovec.c
	modified:   lib/qiovec.h
	modified:   lib/qpath.c
	modified:   lib/qpnexus.c
	modified:   lib/qpnexus.h
	modified:   lib/qpselect.c
	modified:   lib/qpthreads.h
	modified:   lib/qstring.c
	modified:   lib/qstring.h
	modified:   lib/qtime.c
	modified:   lib/qtime.h
	modified:   lib/qtimers.c
	modified:   lib/qtimers.h
	modified:   lib/routemap.c
	modified:   lib/symtab.h
	modified:   lib/thread.h
	deleted:    lib/uty.h
	modified:   lib/vector.c
	modified:   lib/vector.h
	modified:   lib/version.h.in
	modified:   lib/vio_fifo.c
	modified:   lib/vio_fifo.h
	modified:   lib/vio_lines.c
	modified:   lib/vio_lines.h
	modified:   lib/vty.c
	modified:   lib/vty.h
	modified:   lib/vty_cli.c
	modified:   lib/vty_cli.h
	modified:   lib/vty_io.c
	modified:   lib/vty_io.h
	modified:   lib/vty_io_basic.c
	modified:   lib/vty_io_basic.h
	modified:   lib/vty_io_file.c
	modified:   lib/vty_io_file.h
	modified:   lib/vty_io_shell.c
	modified:   lib/vty_io_term.c
	modified:   lib/vty_io_term.h
	modified:   lib/vty_local.h
	modified:   lib/vty_pipe.c
	modified:   lib/workqueue.h
	modified:   lib/zebra.h
	modified:   ospf6d/ospf6_lsa.c
	modified:   ripngd/ripngd.c
	modified:   tests/test-list_util.c
	modified:   tests/test-vector.c
	modified:   vtysh/vtysh.c
	modified:   vtysh/vtysh_config.c

1 files changed, 9 insertions, 9 deletions

diff --git a/vtysh/vtysh.c b/vtysh/vtysh.c
index 3692a953..17f6a994 100644
--- a/vtysh/vtysh.c
+++ b/vtysh/vtysh.c
@@ -30,8 +30,8 @@
 #include <readline/readline.h>
 #include <readline/history.h>
 
-#include "command.h"
 #include "command_execute.h"
+#include "command.h"
 #include "memory.h"
 #include "vtysh/vtysh.h"
 #include "log.h"
@@ -278,7 +278,7 @@ vtysh_execute_func (const char *line, int pager)
 {
   int ret, cmd_stat;
   u_int i;
-  struct cmd_element *cmd;
+  struct cmd_command *cmd;
   FILE *fp = NULL;
   int closepager = 0;
   int tried = 0;
@@ -287,7 +287,7 @@ vtysh_execute_func (const char *line, int pager)
   /* TODO: how well does vtysh_execute_func work ?? -- esp. qpthreads_enabled */
   vtysh_vty->buf = line ;
 
-  saved_ret = ret = cmd_execute_command (vtysh_vty, cmd_parse_completion, &cmd);
+  saved_ret = ret = cmd_execute_command (vtysh_vty, cmd_parse_standard, &cmd);
 
   if ((ret == CMD_SUCCESS) && (cmd == NULL))
     return ret ;                /* quit if nothing to do ???            */
@@ -300,8 +300,8 @@ vtysh_execute_func (const char *line, int pager)
   while (ret != CMD_SUCCESS && ret != CMD_SUCCESS_DAEMON && ret != CMD_WARNING
 	 && vtysh_vty->node > CONFIG_NODE)
     {
-      vtysh_vty->node = node_parent(vtysh_vty->node);
-      ret = cmd_execute_command (vtysh_vty, cmd_parse_completion, &cmd);
+      vtysh_vty->node = cmd_node_parent(vtysh_vty->node);
+      ret = cmd_execute_command (vtysh_vty, cmd_parse_standard, &cmd);
       tried++;
     }
 
@@ -385,7 +385,7 @@ vtysh_execute_func (const char *line, int pager)
 
 		vtysh_vty->buf = line ;
 
-		ret = cmd_execute_command (vtysh_vty, cmd_parse_completion, &cmd);
+		ret = cmd_execute_command (vtysh_vty, cmd_parse_standard, &cmd);
 		if (ret != CMD_SUCCESS_DAEMON)
 		  break;
 	      }
@@ -442,7 +442,7 @@ int
 vtysh_config_from_file (struct vty *vty, FILE *fp)
 {
   int ret;
-  struct cmd_element *cmd;
+  struct cmd_command *cmd;
 
   /* TODO: (1) allocate buffer for vty->buf  (2) what about CMD_QUEUED ??    */
 
@@ -592,14 +592,14 @@ vtysh_rl_describe (void)
 	if (desc->cmd[0] == '\0')
 	  continue;
 
-	if (! desc->str)
+	if (! desc->doc)
 	  fprintf (stdout,"  %-s\n",
 		   desc->cmd[0] == '.' ? desc->cmd + 1 : desc->cmd);
 	else
 	  fprintf (stdout,"  %-*s  %s\n",
 		   width,
 		   desc->cmd[0] == '.' ? desc->cmd + 1 : desc->cmd,
-		   desc->str);
+		   desc->doc);
       }
 
   cmd_free_strvec (vline);