Merge branch 'vtysh-grammar'

Conflicts:
	isisd/isisd.c
	lib/Makefile.am
	lib/thread.c

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

diff --cc bgpd/bgp_aspath.c
index 89a529d7387376c51407edc61bc7af910bfb0424,de6caa159657093802d6af85c66a5ca364f01055..bdafe5a0cbd7377c601b7f09326ea8ff95736454
--- 1/bgpd/bgp_aspath.c
--- 2/bgpd/bgp_aspath.c
+++ b/bgpd/bgp_aspath.c
@@@ -25,8 -25,10 +25,9 @@@ Software Foundation, Inc., 59 Temple Pl
  #include "memory.h"
  #include "vector.h"
  #include "vty.h"
 -#include "str.h"
  #include "log.h"
  #include "stream.h"
+ #include "command.h"
  #include "jhash.h"
  #include "queue.h"
  #include "filter.h"

diff --cc bgpd/bgp_debug.c
Simple merge

diff --cc bgpd/bgp_route.c
Simple merge

diff --cc bgpd/bgp_routemap.c
Simple merge

diff --cc bgpd/bgp_vty.c
Simple merge

diff --cc bgpd/bgpd.c
Simple merge

diff --cc bgpd/rfapi/vnc_debug.c
Simple merge

diff --cc configure.ac
Simple merge

diff --cc isisd/isisd.c
Simple merge

diff --cc lib/Makefile.am
index 72395068137f86669e2d180ceaaff10353450917,f0d5bd53db569f5ea0a360c5a6a230cfa9b2dddb..cf6c6cd1a7f8c3f6c335a35426c4651d3edd7775
--- 1/lib/Makefile.am
--- 2/lib/Makefile.am
+++ b/lib/Makefile.am
@@@ -9,28 -10,32 +10,32 @@@ lib_LTLIBRARIES = libzebra.l
  libzebra_la_LDFLAGS = -version-info 0:0:0 
  
  libzebra_la_SOURCES = \
 -      network.c pid_output.c getopt.c getopt1.c daemon.c \
 +      network.c pid_output.c getopt.c getopt1.c \
-       checksum.c vector.c linklist.c vty.c command.c \
+       checksum.c vector.c linklist.c vty.c \
+       graph.c command_parse.y command_lex.l command_match.c \
+       command.c \
        sockunion.c prefix.c thread.c if.c buffer.c table.c hash.c \
 -      filter.c routemap.c distribute.c stream.c str.c log.c plist.c \
 +      filter.c routemap.c distribute.c stream.c log.c plist.c \
        zclient.c sockopt.c smux.c agentx.c snmp.c md5.c if_rmap.c keychain.c privs.c \
        sigevent.c pqueue.c jhash.c workqueue.c nexthop.c json.c \
        ptm_lib.c csv.c bfd.c vrf.c systemd.c ns.c memory.c memory_vty.c \
        imsg-buffer.c imsg.c skiplist.c \
        qobj.c \
 -      event_counter.c
 +      event_counter.c \
 +      strlcpy.c \
 +      strlcat.c
  
- BUILT_SOURCES = route_types.h gitversion.h
+ BUILT_SOURCES = route_types.h gitversion.h command_parse.h
  
 -libzebra_la_DEPENDENCIES = @LIB_REGEX@
 -
 -libzebra_la_LIBADD = @LIB_REGEX@ @LIBCAP@
 +libzebra_la_LIBADD = @LIBCAP@
  
  pkginclude_HEADERS = \
-       buffer.h checksum.h command.h filter.h getopt.h hash.h \
+       buffer.h checksum.h filter.h getopt.h hash.h \
        if.h linklist.h log.h \
+       graph.h command_match.h \
+       command.h \
        memory.h network.h prefix.h routemap.h distribute.h sockunion.h \
 -      str.h stream.h table.h thread.h vector.h version.h vty.h zebra.h \
 +      stream.h table.h thread.h vector.h version.h vty.h zebra.h \
        plist.h zclient.h sockopt.h smux.h md5.h if_rmap.h keychain.h \
        privs.h sigevent.h pqueue.h jhash.h zassert.h \
        workqueue.h route_types.h libospf.h nexthop.h json.h \

diff --cc lib/if.c
Simple merge

diff --cc lib/thread.c
Simple merge

diff --cc lib/vty.c
Simple merge

diff --cc lib/zebra.h
Simple merge

diff --cc vtysh/extract.pl.in
Simple merge