diff --git a/src/sensors.c b/src/sensors.c
index 96a54fca91cb56bc9bb825f93a749b291c2c71c7..209482e09f88e37a536641bda22d71e2d71810b4 100644 (file)
--- a/src/sensors.c
+++ b/src/sensors.c
# ifndef SENSORS_CONF_PATH
# define SENSORS_CONF_PATH "/etc/sensors.conf"
# endif
-static const char *conffile = SENSORS_CONF_PATH;
+static char *conffile = SENSORS_CONF_PATH;
/* #endif SENSORS_API_VERSION < 0x400 */
#elif (SENSORS_API_VERSION >= 0x400) && (SENSORS_API_VERSION < 0x500)
struct featurelist *next;
} featurelist_t;
-static const char *conffile = NULL;
+static char *conffile = NULL;
/* #endif (SENSORS_API_VERSION >= 0x400) && (SENSORS_API_VERSION < 0x500) */
#else /* if SENSORS_API_VERSION >= 0x500 */
if (sensor_list == NULL)
sensor_list = ignorelist_create (1);
+ /* TODO: This setting exists for compatibility with old versions of
+ * lm-sensors. Remove support for those ancient versions in the next
+ * major release. */
if (strcasecmp (key, "SensorConfigFile") == 0)
{
- /* we will leak memory here if SensorConfigFile is
- used more than once, maybe we can just drop support
- for broken, extremely ancient libsensors? */
- conffile = strdup (value);
+ char *tmp = strdup (value);
+ if (tmp != NULL)
+ {
+ sfree (conffile);
+ conffile = tmp;
+ }
}
else if (strcasecmp (key, "Sensor") == 0)
{
call_once = 1;
- if (conffile)
+ if (conffile != NULL)
{
fh = fopen (conffile, "r");
if (fh == NULL)