From 2fcc7988ea09b8505c0fbf134ecffe98e4c026b6 Mon Sep 17 00:00:00 2001 From: David Lamparter Date: Wed, 8 Mar 2017 01:56:02 +0100 Subject: [PATCH] *: 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 --- bgpd/bgp_main.c | 2 +- ospfd/ospf_main.c | 2 +- zebra/main.c | 17 +++++++++-------- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/bgpd/bgp_main.c b/bgpd/bgp_main.c index 5bf200727a..423c9453eb 100644 --- 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 fd17458d32..5705dad5d4 100644 --- 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 bbfae3bb5b..b70ce7eda7 100644 --- 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 */ ); -- 2.39.5