 @@ -1,14 +1,14 @@
-/* $NetBSD: envstat.c,v 1.92 2012/12/13 19:31:25 christos Exp $ */
+/* $NetBSD: envstat.c,v 1.93 2012/12/13 20:06:42 christos 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.92 2012/12/13 19:31:25 christos Exp $");
+__RCSID("$NetBSD: envstat.c,v 1.93 2012/12/13 20:06:42 christos Exp $");
 #endif /* not lint */
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdbool.h>
 #include <stdarg.h>
 #include <stdint.h>
 #include <string.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <err.h>
 #include <errno.h>
 #include <paths.h>
 @@ -102,57 +102,53 @@ static SIMPLEQ_HEAD(, envsys_sensor) sen
 /* A simple queue to manage statistics for all sensors */
 static SIMPLEQ_HEAD(, envsys_sensor_stats) sensor_stats_list =
     SIMPLEQ_HEAD_INITIALIZER(sensor_stats_list);
 static unsigned int 	interval, flags, width;
 static char 		*mydevname, *sensors;
 static bool 		statistics;
 static u_int		header_passes;
 static int 		parse_dictionary(int);
 static int 		send_dictionary(FILE *);
 static int 		find_sensors(prop_array_t, const char *, dvprops_t);
 static void 		print_sensors(void);
-static int 		check_sensors(char *);
+static int 		check_sensors(const char *);
 static int 		usage(void);
 static int		sysmonfd; /* fd of /dev/sysmon */
 int main(int argc, char **argv)
+{
 	prop_dictionary_t dict;
 	int c, rval = 0;
 	char *endptr, *configfile = NULL;
 	FILE *cf;
 	if (prog_init && prog_init() == -1)
 		err(1, "init failed");
 	setprogname(argv[0]);
 	while ((c = getopt(argc, argv, "c:Dd:fIi:klrSs:Tw:Wx")) != -1) {
 		switch (c) {
 		case 'c':	/* configuration file */
-			configfile = strdup(optarg);
+			configfile = optarg;
 			if (configfile == NULL)
 				err(EXIT_FAILURE, "strdup");
 			break;
 		case 'D':	/* list registered devices */
 			flags |= ENVSYS_DFLAG;
 			break;
 		case 'd':	/* show sensors of a specific device */
-			mydevname = strdup(optarg);
+			mydevname = optarg;
 			if (mydevname == NULL)
 				err(EXIT_FAILURE, "strdup");
 			break;
 		case 'f':	/* display temperature in Farenheit */
 			flags |= ENVSYS_FFLAG;
 			break;
 		case 'I':	/* Skips invalid sensors */
 			flags |= ENVSYS_IFLAG;
 			break;
 		case 'i':	/* wait time between intervals */
 			interval = (unsigned int)strtoul(optarg, &endptr, 10);
 			if (*endptr != '\0')
 				errx(EXIT_FAILURE, "bad interval '%s'", optarg);
 			break;
 		case 'k':	/* display temperature in Kelvin */
 @@ -161,29 +157,27 @@ int main(int argc, char **argv)
 		case 'l':	/* list sensors */
 			flags |= ENVSYS_LFLAG;
 			break;
 		case 'r':
 			/*
 			 * This flag is noop.. it's only here for
 			 * compatibility with the old implementation.
 			 */
 			break;
 		case 'S':
 			flags |= ENVSYS_SFLAG;
 			break;
 		case 's':	/* only show specified sensors */
-			sensors = strdup(optarg);
+			sensors = optarg;
 			if (sensors == NULL)
 				err(EXIT_FAILURE, "strdup");
 			break;
 		case 'T':	/* make statistics */
 			flags |= ENVSYS_TFLAG;
 			break;
 		case 'w':	/* width value for the lines */
 			width = (unsigned int)strtoul(optarg, &endptr, 10);
 			if (*endptr != '\0')
 				errx(EXIT_FAILURE, "bad width '%s'", optarg);
 			break;
 		case 'x':	/* print the dictionary in raw format */
 			flags |= ENVSYS_XFLAG;
 			break;
 		case 'W':	/* No longer used, retained for compatibility */
 @@ -271,30 +265,26 @@ int main(int argc, char **argv)
 		for (;;) {
 			rval = parse_dictionary(sysmonfd);
 			if (rval)
 				break;
 			(void)fflush(stdout);
 			(void)sleep(interval);
+		}
 	/* Show sensors without interval */
 	} else {
 		rval = parse_dictionary(sysmonfd);
+	}
 	if (sensors)
 		free(sensors);
 	if (mydevname)
 		free(mydevname);
 	(void)prog_close(sysmonfd);
 	return rval ? EXIT_FAILURE : EXIT_SUCCESS;
+}
 static int
 send_dictionary(FILE *cf)
+{
 	prop_dictionary_t kdict, udict;
 	int error = 0;
 	/* Retrieve dictionary from kernel */
 	error = prop_dictionary_recv_ioctl(sysmonfd,
 @@ -428,35 +418,28 @@ parse_dictionary(int fd)
 					(void)printf("second)\n");
 				else
 					(void)printf("%d seconds)\n",
 					    (int)edp->refresh_timo);
+			}
 			free(edp);
 			edp = NULL;
+		}
 		prop_object_iterator_release(iter);
+	}
 	/* print sensors now */
-	if (sensors) {
+	if (sensors)
-		char *str = strdup(sensors);
+		rval = check_sensors(sensors);
 		if (!str) {
 			rval = ENOMEM;
 			goto out;
 		rval = check_sensors(str);
 		free(str);
 	if ((flags & ENVSYS_LFLAG) == 0 && (flags & ENVSYS_DFLAG) == 0)
 		print_sensors();
 	if (interval)
 		(void)printf("\n");
 out:
 	while ((sensor = SIMPLEQ_FIRST(&sensors_list))) {
 		SIMPLEQ_REMOVE_HEAD(&sensors_list, entries);
 		free(sensor);
+	}
 	if (edp)
 		free(edp);
 	prop_object_release(dict);
 @@ -649,76 +632,83 @@ find_sensors(prop_array_t array, const c
 			/* compute avg value */
 			stats->avg =
 			    (sensor->cur_value + stats->max + stats->min) / 3;
+		}
+	}
 	/* free memory */
 	prop_object_iterator_release(iter);
 	return 0;
+}
 static int
-check_sensors(char *str)
+check_sensors(const char *str)
+{
 	sensor_t sensor = NULL;
-	char *dvstring, *sstring, *p, *last;
+	char *dvstring, *sstring, *p, *last, *s;
 	bool sensor_found = false;
 	if ((s = strdup(str)) == NULL)
 		return errno;
 	/*
 	 * Parse device name and sensor description and find out
 	 * if the sensor is valid.
 	 */
-	for ((p = strtok_r(str, ",", &last)); p;
+	for ((p = strtok_r(s, ",", &last)); p;
 	     (p = strtok_r(NULL, ",", &last))) {
 		/* get device name */
 		dvstring = strtok(p, ":");
 		if (dvstring == NULL) {
 			warnx("missing device name");
-			return EINVAL;
+			goto out;
+		}
 		/* get sensor description */
 		sstring = strtok(NULL, ":");
 		if (sstring == NULL) {
 			warnx("missing sensor description");
-			return EINVAL;
+			goto out;
+		}
 		SIMPLEQ_FOREACH(sensor, &sensors_list, entries) {
 			/* skip until we match device */
 			if (strcmp(dvstring, sensor->dvname))
 				continue;
 			if (strcmp(sstring, sensor->desc) == 0) {
 				sensor->visible = true;
 				sensor_found = true;
 				break;
+			}
+		}
 		if (sensor_found == false) {
 			warnx("unknown sensor `%s' for device `%s'",
 		       	    sstring, dvstring);
-			return EINVAL;
+			goto out;
+		}
 		sensor_found = false;
+	}
 	/* check if all sensors were ok, and error out if not */
 	SIMPLEQ_FOREACH(sensor, &sensors_list, entries)
-		if (sensor->visible)
+		if (sensor->visible) {
 			free(s);
 			return 0;
+		}
 	warnx("no sensors selected to display");
 out:
 	free(s);
 	return EINVAL;
+}
 static void
 print_sensors(void)
+{
 	sensor_t sensor;
 	sensor_stats_t stats = NULL;
 	size_t maxlen = 0, ilen;
 	double temp = 0;
 	const char *invalid = "N/A", *degrees, *tmpstr, *stype;
 	const char *a, *b, *c, *d, *e, *units;