[Pkg-wmaker-commits] [wmgtemp] 03/10: wmgtemp: Autodetect sensors.conf instead of providing default value.

[Doug Torrance]

This is an automated email from the git hooks/post-receive script.

dtorrance-guest pushed a commit to branch upstream
in repository wmgtemp.

commit d0cf138ad667d515efd9ed71e92c64b210f4ece7
Author: Doug Torrance <dtorrance at piedmont.edu>
Date:   Wed Feb 1 21:51:57 2017 -0500

    wmgtemp: Autodetect sensors.conf instead of providing default value.
    
    Patch by Aurelien Jarno <aurel32 at debian.org>.
    
    From
    http://sources.debian.net/src/wmgtemp/1.1-3/debian/patches/sensors.conf.patch/
---
 src/wmgtemp.c | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/wmgtemp.c b/src/wmgtemp.c
index b8951c7..02d75a5 100644
--- a/src/wmgtemp.c
+++ b/src/wmgtemp.c
@@ -663,11 +663,15 @@ int init_sensors() {
   FILE *config_file;
   int res;
 
-  config_file = fopen(rc_config, "r");
+  if (rc_config) {
+    config_file = fopen(rc_config, "r");
 
-  if(config_file == NULL) {
-    fprintf(stderr, "Error opening %s\n", rc_config);
-    return 0;
+    if(config_file == NULL) {
+      fprintf(stderr, "Error opening %s\n", rc_config);
+      return 0;
+    }
+  } else {
+    config_file = NULL; /* Use libsensors default */
   }
 
   res = sensors_init(config_file);
@@ -677,7 +681,7 @@ int init_sensors() {
     return 0;
   }
 
-  if(fclose(config_file))
+  if(config_file && fclose(config_file))
     perror("Error closing sensors config");
 
   return 1;
@@ -688,7 +692,7 @@ void display_usage() {
 	 "Usage: wmgtemp [options]\n" \
 	 "Options:\n" \
 	 "   -S, --sensorconf=PATH  Specify sensors config file PATH\n" \
-	 "                          [Default: /etc/sensors.conf]\n" \
+	 "                          [Default: autodetect]\n" \
 	 "   -s, --scale=SCALE      Display temperatures in SCALE\n" \
 	 "                          SCALE=kelvin, fahrenheit\n" \
 	 "                          [Default: celcius]\n" \
@@ -950,9 +954,6 @@ int process_config(int argc, char **argv) {
   if(rc_chip != NULL) {
     sensor_chip = strdup(rc_chip);
   }
-  if(rc_config == NULL) {
-    rc_config = "/etc/sensors.conf";
-  }
 
   if(rc_graph != NULL) {
     if(!strncmp(rc_graph, "l", 1)) {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmgtemp.git