diff options
| author | phk <phk@FreeBSD.org> | 2005-09-30 08:30:20 +0000 |
|---|---|---|
| committer | phk <phk@FreeBSD.org> | 2005-09-30 08:30:20 +0000 |
| commit | f6f17c19575af9830aee001f09399dcf5c5bc604 (patch) | |
| tree | 6539c591b61edc79caf540e27a0438c01c3129f9 /usr.sbin/watchdogd | |
| parent | a1fdec3aa1be12fa57de4cb012fcafcef8b4a94b (diff) | |
| download | FreeBSD-src-f6f17c19575af9830aee001f09399dcf5c5bc604.zip FreeBSD-src-f6f17c19575af9830aee001f09399dcf5c5bc604.tar.gz | |
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"
Diffstat (limited to 'usr.sbin/watchdogd')
| -rw-r--r-- | usr.sbin/watchdogd/watchdogd.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/usr.sbin/watchdogd/watchdogd.c b/usr.sbin/watchdogd/watchdogd.c index 8d084c7..01ccdd6 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."); } |
