summaryrefslogtreecommitdiffstats
path: root/watchfrr/watchfrr.c
diff options
context:
space:
mode:
authorDavid Lamparter <equinox@opensourcerouting.org>2017-08-09 11:28:22 +0200
committerDavid Lamparter <equinox@opensourcerouting.org>2017-08-09 11:30:58 +0200
commit999f153ecea7eccb6fd541f7b38d88b7eb8dfd40 (patch)
treeba04d51e5c9b4db7b4f50116fb84bbeb361c370e /watchfrr/watchfrr.c
parentwatchfrr: remove STATEDIR preprocessor define (diff)
downloadfrr-999f153ecea7eccb6fd541f7b38d88b7eb8dfd40.tar.xz
frr-999f153ecea7eccb6fd541f7b38d88b7eb8dfd40.zip
watchfrr: print specific error for removed options
... and document them in the man page. Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
Diffstat (limited to 'watchfrr/watchfrr.c')
-rw-r--r--watchfrr/watchfrr.c12
1 files changed, 11 insertions, 1 deletions
diff --git a/watchfrr/watchfrr.c b/watchfrr/watchfrr.c
index 37f6fb53d..efdba4b7e 100644
--- a/watchfrr/watchfrr.c
+++ b/watchfrr/watchfrr.c
@@ -964,6 +964,8 @@ FRR_DAEMON_INFO(watchfrr, WATCHFRR,
.privs = &watchfrr_privs, )
+#define DEPRECATED_OPTIONS "aAezR:"
+
int main(int argc, char **argv)
{
int opt;
@@ -977,10 +979,18 @@ int main(int argc, char **argv)
frr_preinit(&watchfrr_di, argc, argv);
progname = watchfrr_di.progname;
- frr_opt_add("b:dk:l:i:p:r:S:s:t:T:", longopts, "");
+ frr_opt_add("b:dk:l:i:p:r:S:s:t:T:" DEPRECATED_OPTIONS, longopts, "");
gs.restart.name = "all";
while ((opt = frr_getopt(argc, argv, NULL)) != EOF) {
+ if (opt && opt < 128 && strchr(DEPRECATED_OPTIONS, opt)) {
+ fprintf(stderr,
+ "The -%c option no longer exists.\n"
+ "Please refer to the watchfrr(8) man page.\n",
+ opt);
+ exit(1);
+ }
+
switch (opt) {
case 0:
break;