CVS commit: src/sbin/wdogctl
Module Name:src Committed By: jruoho Date: Sat Jul 11 12:51:21 UTC 2020 Modified Files: src/sbin/wdogctl: wdogctl.8 Log Message: Xref x86/tco(4) instead of the parent x86/ichlpcib(4) bridge. To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.25 src/sbin/wdogctl/wdogctl.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sbin/wdogctl/wdogctl.8 diff -u src/sbin/wdogctl/wdogctl.8:1.24 src/sbin/wdogctl/wdogctl.8:1.25 --- src/sbin/wdogctl/wdogctl.8:1.24 Thu Aug 11 08:00:05 2011 +++ src/sbin/wdogctl/wdogctl.8 Sat Jul 11 12:51:21 2020 @@ -1,4 +1,4 @@ -.\" $NetBSD: wdogctl.8,v 1.24 2011/08/11 08:00:05 mbalmer Exp $ +.\" $NetBSD: wdogctl.8,v 1.25 2020/07/11 12:51:21 jruoho Exp $ .\" .\" Copyright (c) 2000 Zembu Labs, Inc. .\" All rights reserved. @@ -31,7 +31,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd August 11, 2011 +.Dd July 11, 2020 .Dt WDOGCTL 8 .Os .Sh NAME @@ -172,7 +172,7 @@ the timer. .Xr pcweasel 4 , .Xr pwdog 4 , .Xr swwdog 4 , -.Xr x86/ichlpcib 4 +.Xr x86/tco 4 .Sh HISTORY The .Nm
CVS commit: src/sbin/wdogctl
Module Name:src Committed By: pgoyette Date: Wed May 6 23:08:31 UTC 2015 Modified Files: src/sbin/wdogctl: wdogctl.c Log Message: Use _PATH_WATCHDOG from paths.h instead of locally-defined value. To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/sbin/wdogctl/wdogctl.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sbin/wdogctl/wdogctl.c diff -u src/sbin/wdogctl/wdogctl.c:1.20 src/sbin/wdogctl/wdogctl.c:1.21 --- src/sbin/wdogctl/wdogctl.c:1.20 Sat Aug 27 19:00:35 2011 +++ src/sbin/wdogctl/wdogctl.c Wed May 6 23:08:30 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: wdogctl.c,v 1.20 2011/08/27 19:00:35 joerg Exp $ */ +/* $NetBSD: wdogctl.c,v 1.21 2015/05/06 23:08:30 pgoyette Exp $ */ /*- * Copyright (c) 2000 Zembu Labs, Inc. @@ -35,7 +35,7 @@ #include sys/cdefs.h #ifndef lint -__RCSID($NetBSD: wdogctl.c,v 1.20 2011/08/27 19:00:35 joerg Exp $); +__RCSID($NetBSD: wdogctl.c,v 1.21 2015/05/06 23:08:30 pgoyette Exp $); #endif @@ -53,8 +53,7 @@ __RCSID($NetBSD: wdogctl.c,v 1.20 2011/ #include syslog.h #include unistd.h #include string.h - -#define _PATH_WATCHDOG /dev/watchdog +#include paths.h static void enable_kernel(const char *, u_int); static void enable_user(const char *, u_int, int);
CVS commit: src/sbin/wdogctl
Module Name:src
Committed By: joerg
Date: Sat Aug 27 19:00:35 UTC 2011
Modified Files:
src/sbin/wdogctl: wdogctl.c
Log Message:
static + __dead
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sbin/wdogctl/wdogctl.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/wdogctl/wdogctl.c
diff -u src/sbin/wdogctl/wdogctl.c:1.19 src/sbin/wdogctl/wdogctl.c:1.20
--- src/sbin/wdogctl/wdogctl.c:1.19 Tue Jan 4 23:48:44 2011
+++ src/sbin/wdogctl/wdogctl.c Sat Aug 27 19:00:35 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: wdogctl.c,v 1.19 2011/01/04 23:48:44 wiz Exp $ */
+/* $NetBSD: wdogctl.c,v 1.20 2011/08/27 19:00:35 joerg Exp $ */
/*-
* Copyright (c) 2000 Zembu Labs, Inc.
@@ -35,7 +35,7 @@
#include sys/cdefs.h
#ifndef lint
-__RCSID($NetBSD: wdogctl.c,v 1.19 2011/01/04 23:48:44 wiz Exp $);
+__RCSID($NetBSD: wdogctl.c,v 1.20 2011/08/27 19:00:35 joerg Exp $);
#endif
@@ -56,17 +56,16 @@
#define _PATH_WATCHDOG /dev/watchdog
-int main(int, char *[]);
-void enable_kernel(const char *, u_int);
-void enable_user(const char *, u_int, int);
-void enable_ext(const char *, u_int);
-void tickle_ext(void);
-void disable(void);
-void prep_wmode(struct wdog_mode *, int, const char *, u_int);
-void list_timers(void);
-void usage(void);
+static void enable_kernel(const char *, u_int);
+static void enable_user(const char *, u_int, int);
+static void enable_ext(const char *, u_int);
+static void tickle_ext(void);
+static void disable(void);
+static void prep_wmode(struct wdog_mode *, int, const char *, u_int);
+static void list_timers(void);
+__dead static void usage(void);
-int Aflag;
+static int Aflag;
/* Caution -- ordered list; entries = CMD_EXT_TICKLE set timers */
enum cmd {
@@ -173,7 +172,7 @@
exit(EXIT_SUCCESS);
}
-void
+static void
prep_wmode(struct wdog_mode *wp, int mode, const char *name, u_int period)
{
if (strlen(name) = WDOG_NAMESIZE)
@@ -186,7 +185,7 @@
wp-wm_mode |= WDOG_FEATURE_ALARM;
}
-void
+static void
enable_kernel(const char *name, u_int period)
{
struct wdog_mode wm;
@@ -204,7 +203,7 @@
(void)close(fd);
}
-void
+static void
enable_ext(const char *name, u_int period)
{
struct wdog_mode wm;
@@ -226,7 +225,7 @@
return;
}
-void
+static void
enable_user(const char *name, u_int period, int cancel_on_close)
{
struct wdog_mode wm;
@@ -310,8 +309,8 @@
/* NOTREACHED */
}
-void
-tickle_ext()
+static void
+tickle_ext(void)
{
int fd;
@@ -324,7 +323,7 @@
(void)close(fd);
}
-void
+static void
disable(void)
{
struct wdog_mode wm;
@@ -362,7 +361,7 @@
}
}
-void
+static void
list_timers(void)
{
struct wdog_conf wc;
@@ -439,7 +438,7 @@
(void)close(fd);
}
-void
+static void
usage(void)
{
CVS commit: src/sbin/wdogctl
Module Name:src Committed By: mbalmer Date: Thu Aug 11 08:00:05 UTC 2011 Modified Files: src/sbin/wdogctl: wdogctl.8 Log Message: Xr pwdog(4). To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 src/sbin/wdogctl/wdogctl.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sbin/wdogctl/wdogctl.8 diff -u src/sbin/wdogctl/wdogctl.8:1.23 src/sbin/wdogctl/wdogctl.8:1.24 --- src/sbin/wdogctl/wdogctl.8:1.23 Sat Mar 19 08:41:19 2011 +++ src/sbin/wdogctl/wdogctl.8 Thu Aug 11 08:00:05 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: wdogctl.8,v 1.23 2011/03/19 08:41:19 wiz Exp $ +.\ $NetBSD: wdogctl.8,v 1.24 2011/08/11 08:00:05 mbalmer Exp $ .\ .\ Copyright (c) 2000 Zembu Labs, Inc. .\ All rights reserved. @@ -31,7 +31,7 @@ .\ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\ -.Dd March 18, 2011 +.Dd August 11, 2011 .Dt WDOGCTL 8 .Os .Sh NAME @@ -170,6 +170,7 @@ .Xr ipmi 4 , .Xr itesio 4 , .Xr pcweasel 4 , +.Xr pwdog 4 , .Xr swwdog 4 , .Xr x86/ichlpcib 4 .Sh HISTORY
CVS commit: src/sbin/wdogctl
Module Name:src Committed By: wiz Date: Sat Mar 19 08:41:19 UTC 2011 Modified Files: src/sbin/wdogctl: wdogctl.8 Log Message: Add missing comma. To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 src/sbin/wdogctl/wdogctl.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sbin/wdogctl/wdogctl.8 diff -u src/sbin/wdogctl/wdogctl.8:1.22 src/sbin/wdogctl/wdogctl.8:1.23 --- src/sbin/wdogctl/wdogctl.8:1.22 Fri Mar 18 21:22:04 2011 +++ src/sbin/wdogctl/wdogctl.8 Sat Mar 19 08:41:19 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: wdogctl.8,v 1.22 2011/03/18 21:22:04 jruoho Exp $ +.\ $NetBSD: wdogctl.8,v 1.23 2011/03/19 08:41:19 wiz Exp $ .\ .\ Copyright (c) 2000 Zembu Labs, Inc. .\ All rights reserved. @@ -170,7 +170,7 @@ .Xr ipmi 4 , .Xr itesio 4 , .Xr pcweasel 4 , -.Xr swwdog 4 +.Xr swwdog 4 , .Xr x86/ichlpcib 4 .Sh HISTORY The
CVS commit: src/sbin/wdogctl
Module Name:src Committed By: jruoho Date: Fri Mar 18 21:22:04 UTC 2011 Modified Files: src/sbin/wdogctl: wdogctl.8 Log Message: Xref x86/ichlpcib(4) instead of ichlpcib(4). To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 src/sbin/wdogctl/wdogctl.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sbin/wdogctl/wdogctl.8 diff -u src/sbin/wdogctl/wdogctl.8:1.21 src/sbin/wdogctl/wdogctl.8:1.22 --- src/sbin/wdogctl/wdogctl.8:1.21 Mon Jan 17 16:09:48 2011 +++ src/sbin/wdogctl/wdogctl.8 Fri Mar 18 21:22:04 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: wdogctl.8,v 1.21 2011/01/17 16:09:48 jmcneill Exp $ +.\ $NetBSD: wdogctl.8,v 1.22 2011/03/18 21:22:04 jruoho Exp $ .\ .\ Copyright (c) 2000 Zembu Labs, Inc. .\ All rights reserved. @@ -31,7 +31,7 @@ .\ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\ -.Dd January 17, 2011 +.Dd March 18, 2011 .Dt WDOGCTL 8 .Os .Sh NAME @@ -167,11 +167,11 @@ .Xr i386/elansc 4 , .Xr i386/gcscpcib 4 , .Xr i386/geodewdog 4 , -.Xr ichlpcib 4 , .Xr ipmi 4 , .Xr itesio 4 , .Xr pcweasel 4 , .Xr swwdog 4 +.Xr x86/ichlpcib 4 .Sh HISTORY The .Nm
CVS commit: src/sbin/wdogctl
Module Name:src Committed By: jmcneill Date: Mon Jan 17 16:09:48 UTC 2011 Modified Files: src/sbin/wdogctl: wdogctl.8 Log Message: Xr acpiwdrt(4) To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/sbin/wdogctl/wdogctl.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sbin/wdogctl/wdogctl.8 diff -u src/sbin/wdogctl/wdogctl.8:1.20 src/sbin/wdogctl/wdogctl.8:1.21 --- src/sbin/wdogctl/wdogctl.8:1.20 Thu Dec 23 14:29:52 2010 +++ src/sbin/wdogctl/wdogctl.8 Mon Jan 17 16:09:48 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: wdogctl.8,v 1.20 2010/12/23 14:29:52 hauke Exp $ +.\ $NetBSD: wdogctl.8,v 1.21 2011/01/17 16:09:48 jmcneill Exp $ .\ .\ Copyright (c) 2000 Zembu Labs, Inc. .\ All rights reserved. @@ -31,7 +31,7 @@ .\ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\ -.Dd January 9, 2008 +.Dd January 17, 2011 .Dt WDOGCTL 8 .Os .Sh NAME @@ -162,6 +162,7 @@ .Pa /dev/watchdog -- the system monitor watchdog timer device .Sh SEE ALSO +.Xr acpiwdrt 4 , .Xr evbarm/iopwdog 4 , .Xr i386/elansc 4 , .Xr i386/gcscpcib 4 ,
CVS commit: src/sbin/wdogctl
Module Name:src
Committed By: wiz
Date: Tue Jan 4 23:48:45 UTC 2011
Modified Files:
src/sbin/wdogctl: wdogctl.c
Log Message:
Fix fd leaks. Found by cppcheck.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sbin/wdogctl/wdogctl.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/wdogctl/wdogctl.c
diff -u src/sbin/wdogctl/wdogctl.c:1.18 src/sbin/wdogctl/wdogctl.c:1.19
--- src/sbin/wdogctl/wdogctl.c:1.18 Mon Mar 16 13:37:45 2009
+++ src/sbin/wdogctl/wdogctl.c Tue Jan 4 23:48:44 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: wdogctl.c,v 1.18 2009/03/16 13:37:45 lukem Exp $ */
+/* $NetBSD: wdogctl.c,v 1.19 2011/01/04 23:48:44 wiz Exp $ */
/*-
* Copyright (c) 2000 Zembu Labs, Inc.
@@ -35,7 +35,7 @@
#include sys/cdefs.h
#ifndef lint
-__RCSID($NetBSD: wdogctl.c,v 1.18 2009/03/16 13:37:45 lukem Exp $);
+__RCSID($NetBSD: wdogctl.c,v 1.19 2011/01/04 23:48:44 wiz Exp $);
#endif
@@ -200,6 +200,8 @@
if (ioctl(fd, WDOGIOC_SMODE, wm) == -1)
err(EXIT_FAILURE, WDOGIOC_SMODE);
+
+ (void)close(fd);
}
void
@@ -219,6 +221,8 @@
if (ioctl(fd, WDOGIOC_TICKLE) == -1)
syslog(LOG_EMERG, unable to tickle watchdog timer %s: %m,
wm.wm_name);
+
+ (void)close(fd);
return;
}
@@ -316,6 +320,8 @@
err(EXIT_FAILURE, open %s, _PATH_WATCHDOG);
if (ioctl(fd, WDOGIOC_TICKLE) == -1)
fprintf(stderr, Cannot tickle timer\n);
+
+ (void)close(fd);
}
void
@@ -331,6 +337,7 @@
if (ioctl(fd, WDOGIOC_WHICH, wm) == -1) {
printf(No watchdog timer running.\n);
+ (void)close(fd);
return;
}
mode = wm.wm_mode WDOG_MODE_MASK;
CVS commit: src/sbin/wdogctl
Module Name:src Committed By: hauke Date: Thu Dec 23 14:29:52 UTC 2010 Modified Files: src/sbin/wdogctl: wdogctl.8 Log Message: First release that shipped wdogctl(8) was 1.6, not 1.5.1. To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/sbin/wdogctl/wdogctl.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sbin/wdogctl/wdogctl.8 diff -u src/sbin/wdogctl/wdogctl.8:1.19 src/sbin/wdogctl/wdogctl.8:1.20 --- src/sbin/wdogctl/wdogctl.8:1.19 Mon May 18 12:29:31 2009 +++ src/sbin/wdogctl/wdogctl.8 Thu Dec 23 14:29:52 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: wdogctl.8,v 1.19 2009/05/18 12:29:31 wiz Exp $ +.\ $NetBSD: wdogctl.8,v 1.20 2010/12/23 14:29:52 hauke Exp $ .\ .\ Copyright (c) 2000 Zembu Labs, Inc. .\ All rights reserved. @@ -175,7 +175,7 @@ The .Nm command first appeared in -.Nx 1.5.1 . +.Nx 1.6 . .Sh AUTHORS The .Nm
CVS commit: src/sbin/wdogctl
Module Name:src Committed By: wiz Date: Mon May 18 12:29:31 UTC 2009 Modified Files: src/sbin/wdogctl: wdogctl.8 Log Message: Sort SEE ALSO. To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/sbin/wdogctl/wdogctl.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sbin/wdogctl/wdogctl.8 diff -u src/sbin/wdogctl/wdogctl.8:1.18 src/sbin/wdogctl/wdogctl.8:1.19 --- src/sbin/wdogctl/wdogctl.8:1.18 Wed Jan 9 14:35:54 2008 +++ src/sbin/wdogctl/wdogctl.8 Mon May 18 12:29:31 2009 @@ -1,4 +1,4 @@ -.\ $NetBSD: wdogctl.8,v 1.18 2008/01/09 14:35:54 xtraeme Exp $ +.\ $NetBSD: wdogctl.8,v 1.19 2009/05/18 12:29:31 wiz Exp $ .\ .\ Copyright (c) 2000 Zembu Labs, Inc. .\ All rights reserved. @@ -162,10 +162,10 @@ .Pa /dev/watchdog -- the system monitor watchdog timer device .Sh SEE ALSO +.Xr evbarm/iopwdog 4 , .Xr i386/elansc 4 , .Xr i386/gcscpcib 4 , .Xr i386/geodewdog 4 , -.Xr evbarm/iopwdog 4 , .Xr ichlpcib 4 , .Xr ipmi 4 , .Xr itesio 4 ,
