xml2cli/ldpd: sync with the latest changes in CLI code

* use argv[N]->arg instead of argv[N];
* don't skip over non-variable args anymore;
* convert <>s to ()s and ()s to <>s;

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

diff --git a/ldpd/ldp_vty_cmds.c b/ldpd/ldp_vty_cmds.c
index 64715999f27ac8ef7f53678d1f5cb1f13057071b..8aa593cf2ca305144438534256b9d80b41da31d0 100644 (file)
--- a/ldpd/ldp_vty_cmds.c
+++ b/ldpd/ldp_vty_cmds.c
@@ -27,7 +27,7 @@ DEFUN (ldp_l2vpn_word_type_vpls,
 {
   struct vty_arg *args[] =
     {
-      &(struct vty_arg) { .name = "name", .value = argv[0] },
+      &(struct vty_arg) { .name = "name", .value = argv[1]->arg },
       NULL
     };
   return ldp_vty_l2vpn (vty, args);
@@ -60,7 +60,7 @@ DEFUN (ldp_no_l2vpn_word_type_vpls,
   struct vty_arg *args[] =
     {
       &(struct vty_arg) { .name = "no", .value = "no" },
-      &(struct vty_arg) { .name = "name", .value = argv[0] },
+      &(struct vty_arg) { .name = "name", .value = argv[2]->arg },
       NULL
     };
   return ldp_vty_l2vpn (vty, args);
@@ -105,7 +105,7 @@ DEFUN (ldp_discovery_hello_holdtime_disc_time,
   struct vty_arg *args[] =
     {
       &(struct vty_arg) { .name = "hello_type", .value = "hello" },
-      &(struct vty_arg) { .name = "seconds", .value = argv[0] },
+      &(struct vty_arg) { .name = "seconds", .value = argv[3]->arg },
       NULL
     };
   return ldp_vty_disc_holdtime (vty, args);
@@ -122,7 +122,7 @@ DEFUN (ldp_discovery_hello_interval_disc_time,
   struct vty_arg *args[] =
     {
       &(struct vty_arg) { .name = "hello_type", .value = "hello" },
-      &(struct vty_arg) { .name = "seconds", .value = argv[0] },
+      &(struct vty_arg) { .name = "seconds", .value = argv[3]->arg },
       NULL
     };
   return ldp_vty_disc_interval (vty, args);
@@ -139,7 +139,7 @@ DEFUN (ldp_discovery_targeted_hello_holdtime_disc_time,
   struct vty_arg *args[] =
     {
       &(struct vty_arg) { .name = "hello_type", .value = "targeted-hello" },
-      &(struct vty_arg) { .name = "seconds", .value = argv[0] },
+      &(struct vty_arg) { .name = "seconds", .value = argv[3]->arg },
       NULL
     };
   return ldp_vty_disc_holdtime (vty, args);
@@ -156,7 +156,7 @@ DEFUN (ldp_discovery_targeted_hello_interval_disc_time,
   struct vty_arg *args[] =
     {
       &(struct vty_arg) { .name = "hello_type", .value = "targeted-hello" },
-      &(struct vty_arg) { .name = "seconds", .value = argv[0] },
+      &(struct vty_arg) { .name = "seconds", .value = argv[3]->arg },
       NULL
     };
   return ldp_vty_disc_interval (vty, args);
@@ -194,8 +194,8 @@ DEFUN (ldp_neighbor_ipv4_password_word,
 {
   struct vty_arg *args[] =
     {
-      &(struct vty_arg) { .name = "lsr_id", .value = argv[0] },
-      &(struct vty_arg) { .name = "password", .value = argv[1] },
+      &(struct vty_arg) { .name = "lsr_id", .value = argv[1]->arg },
+      &(struct vty_arg) { .name = "password", .value = argv[3]->arg },
       NULL
     };
   return ldp_vty_neighbor_password (vty, args);
@@ -212,8 +212,8 @@ DEFUN (ldp_neighbor_ipv4_session_holdtime_session_time,
 {
   struct vty_arg *args[] =
     {
-      &(struct vty_arg) { .name = "lsr_id", .value = argv[0] },
-      &(struct vty_arg) { .name = "seconds", .value = argv[1] },
+      &(struct vty_arg) { .name = "lsr_id", .value = argv[1]->arg },
+      &(struct vty_arg) { .name = "seconds", .value = argv[4]->arg },
       NULL
     };
   return ldp_vty_session_holdtime (vty, args);
@@ -229,7 +229,7 @@ DEFUN (ldp_neighbor_ipv4_ttl_security_disable,
 {
   struct vty_arg *args[] =
     {
-      &(struct vty_arg) { .name = "lsr_id", .value = argv[0] },
+      &(struct vty_arg) { .name = "lsr_id", .value = argv[1]->arg },
       NULL
     };
   return ldp_vty_neighbor_ttl_security (vty, args);
@@ -246,8 +246,8 @@ DEFUN (ldp_neighbor_ipv4_ttl_security_hops_hops,
 {
   struct vty_arg *args[] =
     {
-      &(struct vty_arg) { .name = "lsr_id", .value = argv[0] },
-      &(struct vty_arg) { .name = "hops", .value = argv[1] },
+      &(struct vty_arg) { .name = "lsr_id", .value = argv[1]->arg },
+      &(struct vty_arg) { .name = "hops", .value = argv[4]->arg },
       NULL
     };
   return ldp_vty_neighbor_ttl_security (vty, args);
@@ -261,7 +261,7 @@ DEFUN (ldp_router_id_ipv4,
 {
   struct vty_arg *args[] =
     {
-      &(struct vty_arg) { .name = "addr", .value = argv[0] },
+      &(struct vty_arg) { .name = "addr", .value = argv[1]->arg },
       NULL
     };
   return ldp_vty_router_id (vty, args);
@@ -312,7 +312,7 @@ DEFUN (ldp_no_discovery_hello_holdtime_disc_time,
     {
       &(struct vty_arg) { .name = "no", .value = "no" },
       &(struct vty_arg) { .name = "hello_type", .value = "hello" },
-      &(struct vty_arg) { .name = "seconds", .value = argv[0] },
+      &(struct vty_arg) { .name = "seconds", .value = argv[4]->arg },
       NULL
     };
   return ldp_vty_disc_holdtime (vty, args);
@@ -331,7 +331,7 @@ DEFUN (ldp_no_discovery_hello_interval_disc_time,
     {
       &(struct vty_arg) { .name = "no", .value = "no" },
       &(struct vty_arg) { .name = "hello_type", .value = "hello" },
-      &(struct vty_arg) { .name = "seconds", .value = argv[0] },
+      &(struct vty_arg) { .name = "seconds", .value = argv[4]->arg },
       NULL
     };
   return ldp_vty_disc_interval (vty, args);
@@ -350,7 +350,7 @@ DEFUN (ldp_no_discovery_targeted_hello_holdtime_disc_time,
     {
       &(struct vty_arg) { .name = "no", .value = "no" },
       &(struct vty_arg) { .name = "hello_type", .value = "targeted-hello" },
-      &(struct vty_arg) { .name = "seconds", .value = argv[0] },
+      &(struct vty_arg) { .name = "seconds", .value = argv[4]->arg },
       NULL
     };
   return ldp_vty_disc_holdtime (vty, args);
@@ -369,7 +369,7 @@ DEFUN (ldp_no_discovery_targeted_hello_interval_disc_time,
     {
       &(struct vty_arg) { .name = "no", .value = "no" },
       &(struct vty_arg) { .name = "hello_type", .value = "targeted-hello" },
-      &(struct vty_arg) { .name = "seconds", .value = argv[0] },
+      &(struct vty_arg) { .name = "seconds", .value = argv[4]->arg },
       NULL
     };
   return ldp_vty_disc_interval (vty, args);
@@ -419,8 +419,8 @@ DEFUN (ldp_no_neighbor_ipv4_password_word,
   struct vty_arg *args[] =
     {
       &(struct vty_arg) { .name = "no", .value = "no" },
-      &(struct vty_arg) { .name = "lsr_id", .value = argv[0] },
-      &(struct vty_arg) { .name = "password", .value = argv[1] },
+      &(struct vty_arg) { .name = "lsr_id", .value = argv[2]->arg },
+      &(struct vty_arg) { .name = "password", .value = argv[4]->arg },
       NULL
     };
   return ldp_vty_neighbor_password (vty, args);
@@ -439,8 +439,8 @@ DEFUN (ldp_no_neighbor_ipv4_session_holdtime_session_time,
   struct vty_arg *args[] =
     {
       &(struct vty_arg) { .name = "no", .value = "no" },
-      &(struct vty_arg) { .name = "lsr_id", .value = argv[0] },
-      &(struct vty_arg) { .name = "seconds", .value = argv[1] },
+      &(struct vty_arg) { .name = "lsr_id", .value = argv[2]->arg },
+      &(struct vty_arg) { .name = "seconds", .value = argv[5]->arg },
       NULL
     };
   return ldp_vty_session_holdtime (vty, args);
@@ -458,7 +458,7 @@ DEFUN (ldp_no_neighbor_ipv4_ttl_security_disable,
   struct vty_arg *args[] =
     {
       &(struct vty_arg) { .name = "no", .value = "no" },
-      &(struct vty_arg) { .name = "lsr_id", .value = argv[0] },
+      &(struct vty_arg) { .name = "lsr_id", .value = argv[2]->arg },
       NULL
     };
   return ldp_vty_neighbor_ttl_security (vty, args);
@@ -477,8 +477,8 @@ DEFUN (ldp_no_neighbor_ipv4_ttl_security_hops_hops,
   struct vty_arg *args[] =
     {
       &(struct vty_arg) { .name = "no", .value = "no" },
-      &(struct vty_arg) { .name = "lsr_id", .value = argv[0] },
-      &(struct vty_arg) { .name = "hops", .value = argv[1] },
+      &(struct vty_arg) { .name = "lsr_id", .value = argv[2]->arg },
+      &(struct vty_arg) { .name = "hops", .value = argv[5]->arg },
       NULL
     };
   return ldp_vty_neighbor_ttl_security (vty, args);
@@ -494,7 +494,7 @@ DEFUN (ldp_no_router_id_ipv4,
   struct vty_arg *args[] =
     {
       &(struct vty_arg) { .name = "no", .value = "no" },
-      &(struct vty_arg) { .name = "addr", .value = argv[0] },
+      &(struct vty_arg) { .name = "addr", .value = argv[2]->arg },
       NULL
     };
   return ldp_vty_router_id (vty, args);
@@ -546,7 +546,7 @@ DEFUN (ldp_session_holdtime_session_time,
 {
   struct vty_arg *args[] =
     {
-      &(struct vty_arg) { .name = "seconds", .value = argv[0] },
+      &(struct vty_arg) { .name = "seconds", .value = argv[2]->arg },
       NULL
     };
   return ldp_vty_session_holdtime (vty, args);
@@ -560,7 +560,7 @@ DEFUN (ldp_interface_ifname,
 {
   struct vty_arg *args[] =
     {
-      &(struct vty_arg) { .name = "ifname", .value = argv[0] },
+      &(struct vty_arg) { .name = "ifname", .value = argv[1]->arg },
       NULL
     };
   return ldp_vty_interface (vty, args);
@@ -575,7 +575,7 @@ DEFUN (ldp_discovery_transport_address_ipv4,
 {
   struct vty_arg *args[] =
     {
-      &(struct vty_arg) { .name = "addr", .value = argv[0] },
+      &(struct vty_arg) { .name = "addr", .value = argv[2]->arg },
       NULL
     };
   return ldp_vty_trans_addr (vty, args);
@@ -590,7 +590,7 @@ DEFUN (ldp_neighbor_ipv4_targeted,
 {
   struct vty_arg *args[] =
     {
-      &(struct vty_arg) { .name = "addr", .value = argv[0] },
+      &(struct vty_arg) { .name = "addr", .value = argv[1]->arg },
       NULL
     };
   return ldp_vty_neighbor_targeted (vty, args);
@@ -656,7 +656,7 @@ DEFUN (ldp_no_session_holdtime_session_time,
   struct vty_arg *args[] =
     {
       &(struct vty_arg) { .name = "no", .value = "no" },
-      &(struct vty_arg) { .name = "seconds", .value = argv[0] },
+      &(struct vty_arg) { .name = "seconds", .value = argv[3]->arg },
       NULL
     };
   return ldp_vty_session_holdtime (vty, args);
@@ -672,7 +672,7 @@ DEFUN (ldp_no_interface_ifname,
   struct vty_arg *args[] =
     {
       &(struct vty_arg) { .name = "no", .value = "no" },
-      &(struct vty_arg) { .name = "ifname", .value = argv[0] },
+      &(struct vty_arg) { .name = "ifname", .value = argv[2]->arg },
       NULL
     };
   return ldp_vty_interface (vty, args);
@@ -689,7 +689,7 @@ DEFUN (ldp_no_discovery_transport_address_ipv4,
   struct vty_arg *args[] =
     {
       &(struct vty_arg) { .name = "no", .value = "no" },
-      &(struct vty_arg) { .name = "addr", .value = argv[0] },
+      &(struct vty_arg) { .name = "addr", .value = argv[3]->arg },
       NULL
     };
   return ldp_vty_trans_addr (vty, args);
@@ -706,7 +706,7 @@ DEFUN (ldp_no_neighbor_ipv4_targeted,
   struct vty_arg *args[] =
     {
       &(struct vty_arg) { .name = "no", .value = "no" },
-      &(struct vty_arg) { .name = "addr", .value = argv[0] },
+      &(struct vty_arg) { .name = "addr", .value = argv[2]->arg },
       NULL
     };
   return ldp_vty_neighbor_targeted (vty, args);
@@ -721,7 +721,7 @@ DEFUN (ldp_discovery_transport_address_ipv6,
 {
   struct vty_arg *args[] =
     {
-      &(struct vty_arg) { .name = "addr", .value = argv[0] },
+      &(struct vty_arg) { .name = "addr", .value = argv[2]->arg },
       NULL
     };
   return ldp_vty_trans_addr (vty, args);
@@ -736,7 +736,7 @@ DEFUN (ldp_neighbor_ipv6_targeted,
 {
   struct vty_arg *args[] =
     {
-      &(struct vty_arg) { .name = "addr", .value = argv[0] },
+      &(struct vty_arg) { .name = "addr", .value = argv[1]->arg },
       NULL
     };
   return ldp_vty_neighbor_targeted (vty, args);
@@ -753,7 +753,7 @@ DEFUN (ldp_no_discovery_transport_address_ipv6,
   struct vty_arg *args[] =
     {
       &(struct vty_arg) { .name = "no", .value = "no" },
-      &(struct vty_arg) { .name = "addr", .value = argv[0] },
+      &(struct vty_arg) { .name = "addr", .value = argv[3]->arg },
       NULL
     };
   return ldp_vty_trans_addr (vty, args);
@@ -770,7 +770,7 @@ DEFUN (ldp_no_neighbor_ipv6_targeted,
   struct vty_arg *args[] =
     {
       &(struct vty_arg) { .name = "no", .value = "no" },
-      &(struct vty_arg) { .name = "addr", .value = argv[0] },
+      &(struct vty_arg) { .name = "addr", .value = argv[2]->arg },
       NULL
     };
   return ldp_vty_neighbor_targeted (vty, args);
@@ -784,7 +784,7 @@ DEFUN (ldp_bridge_ifname,
 {
   struct vty_arg *args[] =
     {
-      &(struct vty_arg) { .name = "ifname", .value = argv[0] },
+      &(struct vty_arg) { .name = "ifname", .value = argv[1]->arg },
       NULL
     };
   return ldp_vty_l2vpn_bridge (vty, args);
@@ -798,7 +798,7 @@ DEFUN (ldp_mtu_mtu,
 {
   struct vty_arg *args[] =
     {
-      &(struct vty_arg) { .name = "mtu", .value = argv[0] },
+      &(struct vty_arg) { .name = "mtu", .value = argv[1]->arg },
       NULL
     };
   return ldp_vty_l2vpn_mtu (vty, args);
@@ -813,7 +813,7 @@ DEFUN (ldp_member_interface_ifname,
 {
   struct vty_arg *args[] =
     {
-      &(struct vty_arg) { .name = "ifname", .value = argv[0] },
+      &(struct vty_arg) { .name = "ifname", .value = argv[2]->arg },
       NULL
     };
   return ldp_vty_l2vpn_interface (vty, args);
@@ -828,7 +828,7 @@ DEFUN (ldp_member_pseudowire_ifname,
 {
   struct vty_arg *args[] =
     {
-      &(struct vty_arg) { .name = "ifname", .value = argv[0] },
+      &(struct vty_arg) { .name = "ifname", .value = argv[2]->arg },
       NULL
     };
   return ldp_vty_l2vpn_pseudowire (vty, args);
@@ -844,7 +844,7 @@ DEFUN (ldp_vc_type_pwtype,
 {
   struct vty_arg *args[] =
     {
-      &(struct vty_arg) { .name = "type", .value = argv[0] },
+      &(struct vty_arg) { .name = "type", .value = argv[2]->arg },
       NULL
     };
   return ldp_vty_l2vpn_pwtype (vty, args);
@@ -860,7 +860,7 @@ DEFUN (ldp_no_bridge_ifname,
   struct vty_arg *args[] =
     {
       &(struct vty_arg) { .name = "no", .value = "no" },
-      &(struct vty_arg) { .name = "ifname", .value = argv[0] },
+      &(struct vty_arg) { .name = "ifname", .value = argv[2]->arg },
       NULL
     };
   return ldp_vty_l2vpn_bridge (vty, args);
@@ -876,7 +876,7 @@ DEFUN (ldp_no_mtu_mtu,
   struct vty_arg *args[] =
     {
       &(struct vty_arg) { .name = "no", .value = "no" },
-      &(struct vty_arg) { .name = "mtu", .value = argv[0] },
+      &(struct vty_arg) { .name = "mtu", .value = argv[2]->arg },
       NULL
     };
   return ldp_vty_l2vpn_mtu (vty, args);
@@ -893,7 +893,7 @@ DEFUN (ldp_no_member_interface_ifname,
   struct vty_arg *args[] =
     {
       &(struct vty_arg) { .name = "no", .value = "no" },
-      &(struct vty_arg) { .name = "ifname", .value = argv[0] },
+      &(struct vty_arg) { .name = "ifname", .value = argv[3]->arg },
       NULL
     };
   return ldp_vty_l2vpn_interface (vty, args);
@@ -910,7 +910,7 @@ DEFUN (ldp_no_member_pseudowire_ifname,
   struct vty_arg *args[] =
     {
       &(struct vty_arg) { .name = "no", .value = "no" },
-      &(struct vty_arg) { .name = "ifname", .value = argv[0] },
+      &(struct vty_arg) { .name = "ifname", .value = argv[3]->arg },
       NULL
     };
   return ldp_vty_l2vpn_pseudowire (vty, args);
@@ -928,7 +928,7 @@ DEFUN (ldp_no_vc_type_pwtype,
   struct vty_arg *args[] =
     {
       &(struct vty_arg) { .name = "no", .value = "no" },
-      &(struct vty_arg) { .name = "type", .value = argv[0] },
+      &(struct vty_arg) { .name = "type", .value = argv[3]->arg },
       NULL
     };
   return ldp_vty_l2vpn_pwtype (vty, args);
@@ -943,7 +943,7 @@ DEFUN (ldp_control_word_cword,
 {
   struct vty_arg *args[] =
     {
-      &(struct vty_arg) { .name = "preference", .value = argv[0] },
+      &(struct vty_arg) { .name = "preference", .value = argv[1]->arg },
       NULL
     };
   return ldp_vty_l2vpn_pw_cword (vty, args);
@@ -959,7 +959,7 @@ DEFUN (ldp_neighbor_address_addr,
 {
   struct vty_arg *args[] =
     {
-      &(struct vty_arg) { .name = "addr", .value = argv[0] },
+      &(struct vty_arg) { .name = "addr", .value = argv[2]->arg },
       NULL
     };
   return ldp_vty_l2vpn_pw_nbr_addr (vty, args);
@@ -974,7 +974,7 @@ DEFUN (ldp_neighbor_lsr_id_ipv4,
 {
   struct vty_arg *args[] =
     {
-      &(struct vty_arg) { .name = "lsr-id", .value = argv[0] },
+      &(struct vty_arg) { .name = "lsr-id", .value = argv[2]->arg },
       NULL
     };
   return ldp_vty_l2vpn_pw_nbr_id (vty, args);
@@ -988,7 +988,7 @@ DEFUN (ldp_pw_id_pwid,
 {
   struct vty_arg *args[] =
     {
-      &(struct vty_arg) { .name = "pwid", .value = argv[0] },
+      &(struct vty_arg) { .name = "pwid", .value = argv[1]->arg },
       NULL
     };
   return ldp_vty_l2vpn_pw_pwid (vty, args);
@@ -1015,7 +1015,7 @@ DEFUN (ldp_no_control_word_cword,
   struct vty_arg *args[] =
     {
       &(struct vty_arg) { .name = "no", .value = "no" },
-      &(struct vty_arg) { .name = "preference", .value = argv[0] },
+      &(struct vty_arg) { .name = "preference", .value = argv[2]->arg },
       NULL
     };
   return ldp_vty_l2vpn_pw_cword (vty, args);
@@ -1033,7 +1033,7 @@ DEFUN (ldp_no_neighbor_address_addr,
   struct vty_arg *args[] =
     {
       &(struct vty_arg) { .name = "no", .value = "no" },
-      &(struct vty_arg) { .name = "addr", .value = argv[0] },
+      &(struct vty_arg) { .name = "addr", .value = argv[3]->arg },
       NULL
     };
   return ldp_vty_l2vpn_pw_nbr_addr (vty, args);
@@ -1050,7 +1050,7 @@ DEFUN (ldp_no_neighbor_lsr_id_ipv4,
   struct vty_arg *args[] =
     {
       &(struct vty_arg) { .name = "no", .value = "no" },
-      &(struct vty_arg) { .name = "lsr-id", .value = argv[0] },
+      &(struct vty_arg) { .name = "lsr-id", .value = argv[3]->arg },
       NULL
     };
   return ldp_vty_l2vpn_pw_nbr_id (vty, args);
@@ -1066,7 +1066,7 @@ DEFUN (ldp_no_pw_id_pwid,
   struct vty_arg *args[] =
     {
       &(struct vty_arg) { .name = "no", .value = "no" },
-      &(struct vty_arg) { .name = "pwid", .value = argv[0] },
+      &(struct vty_arg) { .name = "pwid", .value = argv[2]->arg },
       NULL
     };
   return ldp_vty_l2vpn_pw_pwid (vty, args);
@@ -1147,7 +1147,7 @@ DEFUN (ldp_show_mpls_ldp_address_family_binding,
 {
   struct vty_arg *args[] =
     {
-      &(struct vty_arg) { .name = "address-family", .value = argv[0] },
+      &(struct vty_arg) { .name = "address-family", .value = argv[3]->arg },
       NULL
     };
   return ldp_vty_show_binding (vty, args);
@@ -1165,7 +1165,7 @@ DEFUN (ldp_show_mpls_ldp_address_family_discovery,
 {
   struct vty_arg *args[] =
     {
-      &(struct vty_arg) { .name = "address-family", .value = argv[0] },
+      &(struct vty_arg) { .name = "address-family", .value = argv[3]->arg },
       NULL
     };
   return ldp_vty_show_discovery (vty, args);
@@ -1183,7 +1183,7 @@ DEFUN (ldp_show_mpls_ldp_address_family_interface,
 {
   struct vty_arg *args[] =
     {
-      &(struct vty_arg) { .name = "address-family", .value = argv[0] },
+      &(struct vty_arg) { .name = "address-family", .value = argv[3]->arg },
       NULL
     };
   return ldp_vty_show_interface (vty, args);
@@ -1249,7 +1249,7 @@ DEFUN (ldp_clear_mpls_ldp_neighbor_addr,
 {
   struct vty_arg *args[] =
     {
-      &(struct vty_arg) { .name = "addr", .value = argv[0] },
+      &(struct vty_arg) { .name = "addr", .value = argv[4]->arg },
       NULL
     };
   return ldp_vty_clear_nbr (vty, args);
@@ -1269,7 +1269,7 @@ DEFUN (ldp_debug_mpls_ldp_discovery_hello_dir,
   struct vty_arg *args[] =
     {
       &(struct vty_arg) { .name = "type", .value = "discovery" },
-      &(struct vty_arg) { .name = "dir", .value = argv[0] },
+      &(struct vty_arg) { .name = "dir", .value = argv[5]->arg },
       NULL
     };
   return ldp_vty_debug (vty, args);
@@ -1415,7 +1415,7 @@ DEFUN (ldp_no_debug_mpls_ldp_discovery_hello_dir,
     {
       &(struct vty_arg) { .name = "no", .value = "no" },
       &(struct vty_arg) { .name = "type", .value = "discovery" },
-      &(struct vty_arg) { .name = "dir", .value = argv[0] },
+      &(struct vty_arg) { .name = "dir", .value = argv[6]->arg },
       NULL
     };
   return ldp_vty_debug (vty, args);

diff --git a/tools/xml2cli.pl b/tools/xml2cli.pl
index 43789131c3528dd4db78f9f111d6b0f9e2ec46b4..1b45e7f726c2e6ac402b3bd774162f7f12061730 100755 (executable)
--- a/tools/xml2cli.pl
+++ b/tools/xml2cli.pl
@@ -41,17 +41,17 @@ use XML::LibXML;
                "ipv4m"                 => "A.B.C.D/M",
                "ipv6"                  => "X:X::X:X",
                "ipv6m"                 => "X:X::X:X/M",
-               "mtu"                   => "<1500-9180>",
+               "mtu"                   => "(1500-9180)",
                # BGP specific
                "rd"                    => "ASN:nn_or_IP-address:nn",
-               "asn"                   => "<1-4294967295>",
+               "asn"                   => "(1-4294967295)",
                "community"             => "AA:NN",
-               "clist"                 => "<1-500>",
+               "clist"                 => "(1-500)",
                # LDP specific
-               "disc_time"             => "<1-65535>",
-               "session_time"          => "<15-65535>",
-               "pwid"                  => "<1-4294967295>",
-               "hops"                  => "<1-254>"
+               "disc_time"             => "(1-65535)",
+               "session_time"          => "(15-65535)",
+               "pwid"                  => "(1-4294967295)",
+               "hops"                  => "(1-254)"
                );
 
 # parse options node and store the corresponding information
@@ -91,7 +91,7 @@ sub parse_options {
                push (@cmdstr, $name);
                $::options{$options_name}{'help'} .= "\n       \"" . $help . "\\n\"";
        }
-       $::options{$options_name}{'cmdstr'} = "(" . join('|', @cmdstr) . ")";
+       $::options{$options_name}{'cmdstr'} = "<" . join('|', @cmdstr) . ">";
 }
 
 # given a subtree, replace all the corresponding include nodes by
@@ -122,7 +122,7 @@ sub generate_arguments {
        my @nodes = @_;
        my $arguments;
        my $no_args = 1;
-       my $argc = 0;
+       my $argc = -1;
 
        $arguments .= "  struct vty_arg *args[] =\n";
        $arguments .= "    {\n";
@@ -130,6 +130,7 @@ sub generate_arguments {
                my %node = %{$nodes[$i]};
                my $arg_value;
 
+               $argc++;
                if (not $node{'arg'}) {
                        next;
                }
@@ -139,7 +140,7 @@ sub generate_arguments {
                # argv[] element. for the other types of nodes, the value of the
                # argument is the name of the node
                if ($node{'input'} or $node{'type'} eq "select") {
-                       $arg_value = "argv[" . $argc++ . "]";
+                       $arg_value = "argv[" . $argc . "]->arg";
                } else {
                        $arg_value = '"' . $node{'name'} . '"';
                }