diff options
| -rw-r--r-- | usr.sbin/sensorsd/sensorsd.c | 13 | ||||
| -rw-r--r-- | usr.sbin/sensorsd/sensorsd.conf.5 | 6 |
2 files changed, 8 insertions, 11 deletions
diff --git a/usr.sbin/sensorsd/sensorsd.c b/usr.sbin/sensorsd/sensorsd.c index 11a59d09868..e9641cb070c 100644 --- a/usr.sbin/sensorsd/sensorsd.c +++ b/usr.sbin/sensorsd/sensorsd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sensorsd.c,v 1.12 2005/04/01 22:10:23 hshoexer Exp $ */ +/* $OpenBSD: sensorsd.c,v 1.13 2005/04/01 22:15:40 deraadt Exp $ */ /* * Copyright (c) 2003 Henning Brauer <henning@openbsd.org> @@ -82,11 +82,8 @@ main(int argc, char *argv[]) struct sensor sensor; struct limits_t *limit; size_t len; - time_t next_report, last_report = 0; - time_t next_check; - int mib[3]; - int i, sleeptime, watch_cnt; - int ch; + time_t next_report, last_report = 0, next_check; + int mib[3], i, sleeptime, watch_cnt, ch; while ((ch = getopt(argc, argv, "d")) != -1) { switch (ch) { @@ -207,7 +204,7 @@ void execute(char *command) { char *argp[] = {"sh", "-c", command, NULL}; - + switch (fork ()) { case -1: syslog(LOG_CRIT, "execute: fork() failed"); @@ -252,7 +249,7 @@ report(time_t last_report) } i++; if (cmd[i] == '\0') { - buf[n++] = '\0'; + buf[n++] = '\0'; break; } diff --git a/usr.sbin/sensorsd/sensorsd.conf.5 b/usr.sbin/sensorsd/sensorsd.conf.5 index 31c1bca8ff9..4e7b6aa0d24 100644 --- a/usr.sbin/sensorsd/sensorsd.conf.5 +++ b/usr.sbin/sensorsd/sensorsd.conf.5 @@ -1,4 +1,4 @@ -.\" $OpenBSD: sensorsd.conf.5,v 1.2 2005/04/01 22:10:23 hshoexer Exp $ +.\" $OpenBSD: sensorsd.conf.5,v 1.3 2005/04/01 22:15:40 deraadt Exp $ .\" .\" Copyright (c) 2003 Henning Brauer <henning@openbsd.org> .\" Copyright (c) 2005 Matthew Gream <matthew.gream@pobox.com> @@ -6,7 +6,7 @@ .\" Permission to use, copy, modify, and distribute this software for any .\" purpose with or without fee is hereby granted, provided that the above .\" copyright notice and this permission notice appear in all copies. -.\" +.\" .\" THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES .\" WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF .\" MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR @@ -55,7 +55,7 @@ unit-less number representing RPM. The command is executed on transitions out of, and back into, given limits. Tokens in the command are substituted as follows: %1 with the sensor number, %2 with the sensor's current value, %3 with the -sensor's low limit, and %4 with the sensor's high limit. +sensor's low limit, and %4 with the sensor's high limit. .Sh FILES .Bl -tag -width "/etc/sensorsd.conf" .It /etc/sensorsd.conf |