Changeset 4918

Timestamp:

10/07/07 09:23:32 (1 year ago)

Author:

khali

Message:

Drop the configuration file search path mechanism from sensord. It's
confusing and useless. We dropped it from sensors years ago.

Files:

• lm-sensors/branches/lm-sensors-3.0.0/prog/sensord/args.c (modified) (4 diffs)
• lm-sensors/branches/lm-sensors-3.0.0/prog/sensord/lib.c (modified) (3 diffs)
• lm-sensors/branches/lm-sensors-3.0.0/prog/sensord/sensord.8 (modified) (2 diffs)
• lm-sensors/branches/lm-sensors-3.0.0/prog/sensord/sensord.c (modified) (2 diffs)
• lm-sensors/branches/lm-sensors-3.0.0/prog/sensord/sensord.h (modified) (1 diff)

lm-sensors/branches/lm-sensors-3.0.0/prog/sensord/args.c

@@ -31 +31 @@
-#include "version.h"
-
+#define DEFAULT_CONFIG_FILE     ETCDIR "/sensors.conf"
+
-#define MAX_CHIP_NAMES 32
-
-int isDaemon = 0;
-"sensors.conf"
+DEFAULT_CONFIG_FILE
-const char *pidFile = "/var/run/sensord.pid";
-const char *rrdFile = NULL;
@@ -103 +105 @@
-  "  -T, --rrd-no-average      -- switch RRD in non-average mode\n"
-  "  -r, --rrd-file <file>     -- RRD file (default <none>)\n"
-sensors.conf
+" DEFAULT_CONFIG_FILE "
-  "  -p, --pid-file <file>     -- PID file (default /var/run/sensord.pid)\n"
-  "  -f, --syslog-facility <f> -- syslog facility to use (default local4)\n"
@@ -115 +117 @@
-  "for example, specify --log-interval 0 to only scan for alarms."
-  "\n"
-
-
+
-  "\n"
-  "If no chips are specified, all chip info will be printed.\n"
@@ -129 +130 @@
-  "  -s, --set                 -- execute set statements (root only)\n"
-  "  -r, --rrd-file <file>     -- only update RRD file\n"
-sensors.conf
+" DEFAULT_CONFIG_FILE "
-  "  -d, --debug               -- display some debug information\n"
-  "  -v, --version             -- display version and exit\n"
-  "  -h, --help                -- display help and exit\n"
-  "\n"
-
-
+
-  "\n"
-  "If no chips are specified, all chip info will be printed.\n";

lm-sensors/branches/lm-sensors-3.0.0/prog/sensord/lib.c

@@ -32 +32 @@
-#include "lib/error.h"
-
-static const char *sensorsCfgPaths[] = {
-  "/etc", "/usr/local/etc", "/usr/lib/sensors", "/usr/local/lib/sensors", "/usr/lib", "/usr/local/lib", NULL
-};
-
-#define CFG_PATH_LEN 4096
-
-static char cfgPath[CFG_PATH_LEN + 1];
-
-static time_t cfgLastModified;
-
-int
-initLib
-(void) {
-  cfgPath[CFG_PATH_LEN] = '\0';
-  if (!strcmp (sensorsCfgFile, "-")) {
-    strncpy (cfgPath, sensorsCfgFile, CFG_PATH_LEN);
-  } else if (sensorsCfgFile[0] == '/') {
-    strncpy (cfgPath, sensorsCfgFile, CFG_PATH_LEN);
-  } else if (strchr (sensorsCfgFile, '/')) {
-    char *cwd = getcwd (NULL, 0);
-    snprintf (cfgPath, CFG_PATH_LEN, "%s/%s", cwd, sensorsCfgFile);
-    free (cwd);
-  } else {
-    int index0;
-    struct stat stats;
-    for (index0 = 0; sensorsCfgPaths[index0]; ++ index0) {
-      snprintf (cfgPath, CFG_PATH_LEN, "%s/%s", sensorsCfgPaths[index0], sensorsCfgFile);
-      if (stat (cfgPath, &stats) == 0)
-        break;
-    }
-    if (!sensorsCfgPaths[index0]) {
-      sensorLog (LOG_ERR, "Error locating sensors configuration file: %s", sensorsCfgFile);
-      return 9;
-    }
-  }
-  return 0;
-}
-
-static int
-loadConfig
-
+const char *cfgPath, 
-  struct stat stats;
-  FILE *cfg = NULL;
@@ -112 +76 @@
-int
-loadLib
-void
+const char *cfgPath
-  int ret;
-
+cfgPath, 
-  if (!ret)
-    ret = initKnownChips ();
@@ -122 +86 @@
-int
-reloadLib
-void
+const char *cfgPath
-  int ret;
-  freeKnownChips ();
-
+cfgPath, 
-  if (!ret)
-    ret = initKnownChips ();

lm-sensors/branches/lm-sensors-3.0.0/prog/sensord/sensord.8

@@ -22 +22 @@
-.\" the source, must acknowledge the copyright and authors of this work.
-.\"
-3, 2002
+007
-.SH NAME
-sensord \- Sensor information logging daemon.
@@ -85 +85 @@
-Specify a
-.BR libsensors (3)
-name `sensors.conf'
+default configuration file
-is used.
-
-If the sensors configuration name does not contain a directory separator,
-the following paths are searched for the file:
-`/etc', `/usr/lib/sensors', `/usr/local/lib/sensors', `/usr/lib', `/usr/local/lib'.
-.IP "-p, --pid-file file"
-Specify what PID file to write; the default is to write the file

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

@@ -88 +88 @@
-  while (!done && (ret == 0)) {
-    if (ret == 0)
-
+sensorsCfgFile
-    if ((ret == 0) && scanTime) { /* should I scan on the read cycle? */
-      ret = scanChips ();
@@ -199 +199 @@
-    exit (EXIT_FAILURE);
-  
-
-
+
-    exit (EXIT_FAILURE);
-

lm-sensors/branches/lm-sensors-3.0.0/prog/sensord/sensord.h

@@ -50 +50 @@
-/* from lib.c */
-
-
-
-
+
+
-extern int unloadLib (void);
-