 @@ -1,14 +1,14 @@
-/* $NetBSD: envstat.c,v 1.86 2011/06/04 13:29:02 pgoyette Exp $ */
+/* $NetBSD: envstat.c,v 1.87 2011/06/06 20:48:56 pgoyette Exp $ */
 /*-
  * Copyright (c) 2007, 2008 Juan Romero Pardines.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -17,27 +17,27 @@
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: envstat.c,v 1.86 2011/06/04 13:29:02 pgoyette Exp $");
+__RCSID("$NetBSD: envstat.c,v 1.87 2011/06/06 20:48:56 pgoyette Exp $");
 #endif /* not lint */
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdbool.h>
 #include <stdarg.h>
 #include <string.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <err.h>
 #include <errno.h>
 #include <paths.h>
 #include <syslog.h>
 @@ -753,27 +753,27 @@ print_sensors(void)
 		b = "CritMax";
 		c = "WarnMax";
 		d = "WarnMin";
 		e = "CritMin";
+	}
 	if (!sensors || (!header_passes && sensors) ||
 	    (header_passes == 10 && sensors)) {
 		if (statistics)
 			(void)printf("%s%*s  %9s %8s %8s %8s %6s\n",
 			    mydevname ? "" : "  ", (int)maxlen,
 			    "", a, b, c, d, units);
 		else
-			(void)printf("%s%*s  %9s %8s %8s %8s %8s %4s\n",
+			(void)printf("%s%*s  %9s %8s %8s %8s %8s %5s\n",
 			    mydevname ? "" : "  ", (int)maxlen,
 			    "", a, b, c, d, e, units);
 		if (sensors && header_passes == 10)
 			header_passes = 0;
+	}
 	if (sensors)
 		header_passes++;
 	/* print the sensors */
 	SIMPLEQ_FOREACH(sensor, &sensors_list, entries) {
 		/* skip sensors that were not marked as visible */
 		if (sensors && !sensor->visible)
 			continue;
 @@ -904,145 +904,159 @@ do {								\
+			}
 			(void)printf("%*s", (int)ilen - 4, stype);
 		/* integers */
 		} else if (strcmp(sensor->type, "Integer") == 0) {
 			stype = "none";
 			(void)printf(":%10d ", sensor->cur_value);
 			ilen = 8;
 			if (statistics) {
 				/* show statistics if flag set */
 				(void)printf("%8u %8u %8u ",
 				    stats->max, stats->min, stats->avg);
 				ilen += 2;
 			} else {
 				if (sensor->critmax_value) {
 					(void)printf("%*u ", (int)ilen,
 					    sensor->critmax_value);
 					ilen = 8;
 				} else
 					ilen += 9;
 				if (sensor->warnmax_value) {
 					(void)printf("%*u ", (int)ilen,
 					    sensor->warnmax_value);
 					ilen = 8;
 				} else
 					ilen += 9;
-				if (sensor->warnmin_value) {
+/* Print percentage of max_value */
-					(void)printf("%*u ", (int)ilen,
+#define PRINTPCT(a)							\
-					    sensor->warnmin_value);
+do {									\
-					ilen = 8;
+	if (sensor->max_value) {					\
-				} else
+		(void)printf("%*.3f%%", (int)ilen,			\
-					ilen += 9;
+			((a) * 100.0) / sensor->max_value);		\
 		ilen = 8;						\
 	} else								\
 		ilen += 9;						\
 } while ( /* CONSTCOND*/ 0 )
-				if (sensor->critmin_value) {
+/* Print an integer sensor value */
-					(void)printf( "%*u ", (int)ilen,
+#define PRINTINT(a)							\
-					    sensor->critmin_value);
+do {									\
-					ilen = 8;
+	(void)printf("%*u ", (int)ilen, (a));				\
-				} else
+	ilen = 8;							\
-					ilen += 9;
+} while ( /* CONSTCOND*/ 0 )
 			if (!statistics) {
 				if (sensor->percentage) {
 					PRINTPCT(sensor->critmax_value);
 					PRINTPCT(sensor->warnmax_value);
 					PRINTPCT(sensor->warnmin_value);
 					PRINTPCT(sensor->critmin_value);
 				} else {
 					PRINTINT(sensor->critmax_value);
 					PRINTINT(sensor->warnmax_value);
 					PRINTINT(sensor->warnmin_value);
 					PRINTINT(sensor->critmin_value);
+				}
 			} else {
 				if (sensor->percentage) {
 					PRINTPCT(stats->max);
 					PRINTPCT(stats->min);
 					PRINTPCT(stats->avg);
 				} else {
 					PRINTINT(stats->max);
 					PRINTINT(stats->min);
 					PRINTINT(stats->avg);
+				}
 				ilen += 2;
+			}
 			(void)printf("%*s", (int)ilen - 4, stype);
 #undef PRINTINT
 #undef PRINTPCT
 		/* drives  */
 		} else if (strcmp(sensor->type, "Drive") == 0) {
 			(void)printf(":%10s", sensor->drvstate);
 		/* Battery capacity */
 		} else if (strcmp(sensor->type, "Battery capacity") == 0) {
 			(void)printf(":%10s", sensor->battcap);
 		/* everything else */
 		} else {
 			if (strcmp(sensor->type, "Voltage DC") == 0)
 				stype = "V";
 			else if (strcmp(sensor->type, "Voltage AC") == 0)
 				stype = "VAC";
 			else if (strcmp(sensor->type, "Ampere") == 0)
 				stype = "A";
 			else if (strcmp(sensor->type, "Watts") == 0)
 				stype = "W";
 			else if (strcmp(sensor->type, "Ohms") == 0)
 				stype = "Ohms";
 			else if (strcmp(sensor->type, "Watt hour") == 0)
 				stype = "Wh";
 			else if (strcmp(sensor->type, "Ampere hour") == 0)
 				stype = "Ah";
 			else
 				stype = "?";
 			(void)printf(":%10.3f ",
 			    sensor->cur_value / 1000000.0);
 			ilen = 8;
 			if (!statistics) {
 /* Print percentage of max_value */
 #define PRINTPCT(a)							\
 do {									\
-	if (sensor->a && sensor->max_value) {				\
+	if ((a) && sensor->max_value) {					\
 		(void)printf("%*.3f%%", (int)ilen,			\
-			(sensor->a * 100.0) / sensor->max_value);	\
+			((a) * 100.0) / sensor->max_value);		\
 		ilen = 8;						\
 	} else								\
 		ilen += 9;						\
 } while ( /* CONSTCOND*/ 0 )
 /* Print a generic sensor value */
 #define PRINTVAL(a)							\
 do {									\
-	if (sensor->a) {						\
+	if ((a)) {							\
-		(void)printf("%*.3f ", (int)ilen, sensor->a / 1000000.0); \
+		(void)printf("%*.3f ", (int)ilen, (a) / 1000000.0);	\
 		ilen = 8;						\
 	} else								\
 		ilen += 9;						\
 } while ( /* CONSTCOND*/ 0 )
 			if (!statistics) {
 				if (sensor->percentage) {
-					PRINTPCT(critmax_value);
+					PRINTPCT(sensor->critmax_value);
-					PRINTPCT(warnmax_value);
+					PRINTPCT(sensor->warnmax_value);
-					PRINTPCT(warnmin_value);
+					PRINTPCT(sensor->warnmin_value);
-					PRINTPCT(critmin_value);
+					PRINTPCT(sensor->critmin_value);
 				} else {
-					PRINTVAL(critmax_value);
+					PRINTVAL(sensor->critmax_value);
-					PRINTVAL(warnmax_value);
+					PRINTVAL(sensor->warnmax_value);
-					PRINTVAL(warnmin_value);
+					PRINTVAL(sensor->warnmin_value);
-					PRINTVAL(critmin_value);
+					PRINTVAL(sensor->critmin_value);
 #undef PRINTPCT
-#undef PRINTVAL
+			} else {
 				if (sensor->percentage) {
 					PRINTPCT(stats->max);
 					PRINTPCT(stats->min);
 					PRINTPCT(stats->avg);
 				} else {
 					PRINTVAL(stats->max);
 					PRINTVAL(stats->min);
 					PRINTVAL(stats->avg);
+				}
 			if (statistics && !sensor->percentage) {
 				/* show statistics if flag set */
 				(void)printf("%8.3f %8.3f %8.3f ",
 				    stats->max / 1000000.0,
 				    stats->min / 1000000.0,
 				    stats->avg / 1000000.0);
 				ilen += 2;
+			}
 #undef PRINTPCT
 #undef PRINTVAL
-			(void)printf("%*s", (int)ilen - 4, stype);
+			(void)printf("%*s", (int)ilen - 3, stype);
 			if (sensor->percentage && sensor->max_value) {
 				(void)printf(" (%5.2f%%)",
 				    (sensor->cur_value * 100.0) /
 				    sensor->max_value);
+			}
+		}
 		(void)printf("\n");
+	}
+}
 static int
 usage(void)