Changeset 4986

Timestamp:

10/25/07 11:49:34 (6 years ago)

Author:

khali

Message:

"sensors" no longer needs a default configuration file name. If no
file name is provided on the command line, use the libsensors default.

Location:

lm-sensors/branches/lm-sensors-3.0.0

Files:

• CHANGES (modified) (1 diff)
• prog/sensors/main.c (modified) (5 diffs)
• prog/sensors/sensors.1 (modified) (2 diffs)

lm-sensors/branches/lm-sensors-3.0.0/CHANGES

@@ -7 +7 @@
   sensors: Fix file handle leak on library initialization error
            Handle the case where voltage measurements aren't available
+           No default configuration file name
   sensors-detect: Fix SMSC LPC47B357/M967 detection
                   Select the right driver for FSC chips

lm-sensors/branches/lm-sensors-3.0.0/prog/sensors/main.c

@@ -40 +40 @@
 #define PROGRAM                 "sensors"
 #define VERSION                 LM_VERSION
-#define DEFAULT_CONFIG_FILE     ETCDIR "/sensors.conf"
 
 static int do_sets, do_raw, hide_adapter;
@@ -55 +54 @@
 {
         printf("Usage: %s [OPTION]... [CHIP]...\n", PROGRAM);
-        printf("  -c, --config-file     Specify a config file (default: %s)\n",
-               DEFAULT_CONFIG_FILE);
-        puts("  -h, --help            Display this help text\n"
+        puts("  -c, --config-file     Specify a config file\n"
+             "  -h, --help            Display this help text\n"
              "  -s, --set             Execute `set' statements (root only)\n"
              "  -f, --fahrenheit      Show temperatures in degrees fahrenheit\n"
@@ -89 +87 @@
         int err;
 
-        if (!strcmp(config_file_name, "-"))
-                config_file = stdin;
-        else
-                config_file = fopen(config_file_name, "r");
-
-        if (!config_file) {
-                fprintf(stderr, "Could not open config file\n");
-                perror(config_file_name);
-                return 1;
+        if (config_file_name) {
+                if (!strcmp(config_file_name, "-"))
+                        config_file = stdin;
+                else
+                        config_file = fopen(config_file_name, "r");
+
+                if (!config_file) {
+                        fprintf(stderr, "Could not open config file\n");
+                        perror(config_file_name);
+                        return 1;
+                }
+        } else {
+                /* Use libsensors default */
+                config_file = NULL;
         }
 
@@ -107 +110 @@
         }
 
-        if (fclose(config_file) == EOF)
+        if (config_file && fclose(config_file) == EOF)
                 perror(config_file_name);
 
@@ -240 +243 @@
 {
         int c, res, i, error, do_bus_list;
-        const char *config_file_name = DEFAULT_CONFIG_FILE;
+        const char *config_file_name = NULL;
 
         struct option long_opts[] =  {

lm-sensors/branches/lm-sensors-3.0.0/prog/sensors/sensors.1

@@ -23 +23 @@
 .\" the source, must acknowledge the copyright and authors of this work.
 .\"
-.TH sensors 1  "September 2007" "lm-sensors 3" "Linux User's Manual"
+.TH sensors 1  "October 2007" "lm-sensors 3" "Linux User's Manual"
 .SH NAME
 sensors \- print sensors information
@@ -51 +51 @@
 .SH OPTIONS
 .IP "-c config-file"
-Specify a configuration file. If no file is specified, `/etc/sensors.conf'
-is used. Use `-c /dev/null' to temporarily disable this default configuration
-file.
+Specify a configuration file. If no file is specified, the libsensors
+default configuration file is used. Use `-c /dev/null' to temporarily
+disable this default configuration file.
 .IP -h
 Print a help text and exit.