*: fix some option descriptions and make -e work

There were some typos in command line help, also the "e:" spec was
missing for getopt in zebra/bgpd (even before the refactor).

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

diff --git a/bgpd/bgp_main.c b/bgpd/bgp_main.c
index 5bf200727a42206084b28895217a06330198ab89..423c9453ebbff8b1f0d9003d051f078e0c9e97da 100644 (file)
--- a/bgpd/bgp_main.c
+++ b/bgpd/bgp_main.c
@@ -365,7 +365,7 @@ main (int argc, char **argv)
   char *bgp_address = NULL;
 
   frr_preinit(&bgpd_di, argc, argv);
-  frr_opt_add("p:l:rn", longopts,
+  frr_opt_add("p:l:rne:", longopts,
        "  -p, --bgp_port     Set bgp protocol's port number\n"
        "  -l, --listenon     Listen on specified address (implies -n)\n"
        "  -r, --retain       When program terminates, retain added route by bgpd.\n"

diff --git a/ospfd/ospf_main.c b/ospfd/ospf_main.c
index fd17458d3232e9b7ba5046d1957d35713d215f65..5705dad5d478ac4c388462b83edd0d9588b067f8 100644 (file)
--- a/ospfd/ospf_main.c
+++ b/ospfd/ospf_main.c
@@ -175,7 +175,7 @@ main (int argc, char **argv)
   frr_preinit (&ospfd_di, argc, argv);
   frr_opt_add ("n:a", longopts,
        "  -n, --instance     Set the instance id\n"
-       "  -a. --apiserver    Enable OSPF apiserver\n");
+       "  -a, --apiserver    Enable OSPF apiserver\n");
 
   while (1) 
     {

diff --git a/zebra/main.c b/zebra/main.c
index bbfae3bb5ba94d948ee6d3c4de7237d39584877b..b70ce7eda7fc52617c5bb21574c93cd8f164ad47 100644 (file)
--- a/zebra/main.c
+++ b/zebra/main.c
@@ -223,19 +223,20 @@ main (int argc, char **argv)
 
   frr_preinit(&zebra_di, argc, argv);
 
-  frr_opt_add("bakF:z:r"
+  frr_opt_add("bakF:z:e:r"
 #ifdef HAVE_NETLINK
        "s:"
 #endif
        , longopts,
-       "-b, --batch        Runs in batch mode\n"
-       "-a, --allow_delete Allow other processes to delete Quagga Routes\n"
-       "-F, --fpm_format   Set fpm format to 'netlink' or 'protobuf'\n"
-       "-z, --socket       Set path of zebra socket\n"
-       "-k, --keep_kernel  Don't delete old routes which installed by zebra.\n"
-       "-r, --retain       When program terminates, retain added route by zebra.\n"
+       "  -b, --batch        Runs in batch mode\n"
+       "  -a, --allow_delete Allow other processes to delete Quagga Routes\n"
+       "  -F, --fpm_format   Set fpm format to 'netlink' or 'protobuf'\n"
+       "  -z, --socket       Set path of zebra socket\n"
+       "  -e, --ecmp         Specify ECMP to use.\n"
+       "  -k, --keep_kernel  Don't delete old routes which installed by zebra.\n"
+       "  -r, --retain       When program terminates, retain added route by zebra.\n"
 #ifdef HAVE_NETLINK
-       "-s, --nl-bufsize   Set netlink receive buffer size\n"
+       "  -s, --nl-bufsize   Set netlink receive buffer size\n"
 #endif /* HAVE_NETLINK */
        );