From 2a5f59b24142ddd3b4103d8f1176be3f72e30fdf Mon Sep 17 00:00:00 2001 From: Poul-Henning Kamp Date: Fri, 30 Sep 2005 08:30:20 +0000 Subject: [PATCH] Report any errors we might see when disabling the watchdog. Complain about extra arguments so people don't get surprised if they type "watchdog 0" --- usr.sbin/watchdogd/watchdogd.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/usr.sbin/watchdogd/watchdogd.c b/usr.sbin/watchdogd/watchdogd.c index 8d084c78007c..01ccdd6a0c41 100644 --- a/usr.sbin/watchdogd/watchdogd.c +++ b/usr.sbin/watchdogd/watchdogd.c @@ -129,8 +129,7 @@ main(int argc, char *argv[]) timeout |= WD_PASSIVE; else timeout |= WD_ACTIVE; - if (watchdog_patpat() < 0 && - (timeout & WD_INTERVAL) != WD_TO_NEVER) + if (watchdog_patpat() < 0) err(EX_OSERR, "patting the dog"); return (EX_OK); } @@ -282,6 +281,8 @@ parseargs(int argc, char *argv[]) /* NOTREACHED */ } } + if (argc != optind) + errx(EX_USAGE, "extra arguments."); if (is_daemon && timeout < WD_TO_1SEC) errx(EX_USAGE, "-t argument is less than one second."); }