Module Name: src Committed By: tls Date: Sun Aug 10 06:59:27 UTC 2014
Modified Files: src/usr.sbin/envstat [tls-earlyentropy]: envstat.8 envstat.c Log Message: Rebase. To generate a diff of this commit: cvs rdiff -u -r1.61 -r1.61.16.1 src/usr.sbin/envstat/envstat.8 cvs rdiff -u -r1.94 -r1.94.6.1 src/usr.sbin/envstat/envstat.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/usr.sbin/envstat/envstat.8 diff -u src/usr.sbin/envstat/envstat.8:1.61 src/usr.sbin/envstat/envstat.8:1.61.16.1 --- src/usr.sbin/envstat/envstat.8:1.61 Thu Feb 9 18:10:26 2012 +++ src/usr.sbin/envstat/envstat.8 Sun Aug 10 06:59:27 2014 @@ -1,6 +1,6 @@ -.\" $NetBSD: envstat.8,v 1.61 2012/02/09 18:10:26 riz Exp $ +.\" $NetBSD: envstat.8,v 1.61.16.1 2014/08/10 06:59:27 tls Exp $ .\" -.\" Copyright (c) 2000, 2007, 2008, 2009 The NetBSD Foundation, Inc. +.\" Copyright (c) 2000, 2007, 2008, 2009, 2014 The NetBSD Foundation, Inc. .\" All rights reserved. .\" .\" This code is derived from software contributed to The NetBSD Foundation @@ -27,7 +27,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd June 7, 2011 +.Dd May 18, 2014 .Dt ENVSTAT 8 .Os .Sh NAME @@ -166,6 +166,8 @@ Volts AC Watts .It Wh Watt-hours +.It %rH +relative Humidity .El .Sh EXAMPLES To display the @@ -217,6 +219,7 @@ invalid states every second: .Xr envctrl 4 , .Xr envsys 4 , .Xr finsio 4 , +.Xr hythygtemp 4 , .Xr ipmi 4 , .Xr itesio 4 , .Xr lm 4 , Index: src/usr.sbin/envstat/envstat.c diff -u src/usr.sbin/envstat/envstat.c:1.94 src/usr.sbin/envstat/envstat.c:1.94.6.1 --- src/usr.sbin/envstat/envstat.c:1.94 Fri Dec 14 05:29:28 2012 +++ src/usr.sbin/envstat/envstat.c Sun Aug 10 06:59:27 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: envstat.c,v 1.94 2012/12/14 05:29:28 pgoyette Exp $ */ +/* $NetBSD: envstat.c,v 1.94.6.1 2014/08/10 06:59:27 tls Exp $ */ /*- * Copyright (c) 2007, 2008 Juan Romero Pardines. @@ -27,7 +27,7 @@ #include <sys/cdefs.h> #ifndef lint -__RCSID("$NetBSD: envstat.c,v 1.94 2012/12/14 05:29:28 pgoyette Exp $"); +__RCSID("$NetBSD: envstat.c,v 1.94.6.1 2014/08/10 06:59:27 tls Exp $"); #endif /* not lint */ #include <stdio.h> @@ -975,6 +975,8 @@ do { \ stype = "Wh"; else if (strcmp(sensor->type, "Ampere hour") == 0) stype = "Ah"; + else if (strcmp(sensor->type, "relative Humidity") == 0) + stype = "%rH"; else stype = "?";