Changeset 5647

Timestamp:

02/15/09 18:22:38 (4 years ago)

Author:

khali

Message:

Read extra configuration files from /etc/sensors.d.

Location:

lm-sensors/trunk

Files:

• CHANGES (modified) (1 diff)
• lib/init.c (modified) (6 diffs)
• lib/libsensors.3 (modified) (4 diffs)
• lib/sensors.conf.5 (modified) (4 diffs)

lm-sensors/trunk/CHANGES

@@ -13 +13 @@
               Exit the configuration file parser sooner
               Free bus statements from the configuration file sooner
+              Read extra configuration files from /etc/sensors.d
   lm_sensors.init: Support new format of /etc/sysconfig/lm_sensors (#2246)
                    Drop support for kernels 2.4 and earlier

lm-sensors/trunk/lib/init.c

@@ -2 +2 @@
     init.c - Part of libsensors, a Linux library for reading sensor data.
     Copyright (c) 1998, 1999  Frodo Looijaard <frodol@dds.nl>
-    Copyright (C) 2007        Jean Delvare <khali@linux-fr.org>
+    Copyright (C) 2007, 2009  Jean Delvare <khali@linux-fr.org>
 
     This program is free software; you can redistribute it and/or modify
@@ -20 +20 @@
 */
 
+/* Needed for scandir() and alphasort() */
+#define _BSD_SOURCE
+
+#include <sys/types.h>
 #include <locale.h>
 #include <stdlib.h>
@@ -25 +29 @@
 #include <string.h>
 #include <errno.h>
+#include <dirent.h>
 #include "sensors.h"
 #include "data.h"
@@ -36 +41 @@
 #define DEFAULT_CONFIG_FILE     ETCDIR "/sensors3.conf"
 #define ALT_CONFIG_FILE         ETCDIR "/sensors.conf"
+#define DEFAULT_CONFIG_DIR      ETCDIR "/sensors.d"
 
 /* Wrapper around sensors_yyparse(), which clears the locale so that
@@ -98 +104 @@
         free_config_busses();
         return err;
+}
+
+static int config_file_filter(const struct dirent *entry)
+{
+        return (entry->d_type == DT_REG || entry->d_type == DT_LNK)
+            && entry->d_name[0] != '.';         /* Skip hidden files */
+}
+
+static int add_config_from_dir(const char *dir)
+{
+        int count, res, i;
+        struct dirent **namelist;
+
+        count = scandir(dir, &namelist, config_file_filter, alphasort);
+        if (count < 0) {
+                sensors_parse_error(strerror(errno), 0);
+                return -SENSORS_ERR_PARSE;
+        }
+
+        for (res = 0, i = 0; !res && i < count; i++) {
+                int len;
+                char path[PATH_MAX];
+                FILE *input;
+
+                len = snprintf(path, sizeof(path), "%s/%s", dir,
+                               namelist[i]->d_name);
+                if (len < 0 || len >= (int)sizeof(path)) {
+                        res = -SENSORS_ERR_PARSE;
+                        continue;
+                }
+
+                input = fopen(path, "r");
+                if (input) {
+                        res = parse_config(input);
+                        fclose(input);
+                } else {
+                        res = -SENSORS_ERR_PARSE;
+                        sensors_parse_error(strerror(errno), 0);
+                }
+        }
+
+        /* Free memory allocated by scandir() */
+        for (i = 0; i < count; i++)
+                free(namelist[i]);
+        free(namelist);
+
+        return res;
 }
 
@@ -130 +183 @@
                         goto exit_cleanup;
                 }
+
+                /* Also check for files in default directory */
+                res = add_config_from_dir(DEFAULT_CONFIG_DIR);
+                if (res)
+                        goto exit_cleanup;
         }
 

lm-sensors/trunk/lib/libsensors.3

@@ -1 @@
-.\" Copyright 1998, 1999 Adrian Baugh <adrian.baugh@keble.ox.ac.uk>
+.\" Copyright (C) 1998, 1999  Adrian Baugh <adrian.baugh@keble.ox.ac.uk>
+.\" Copyright (C) 2007, 2009  Jean Delvare <khali@linux-fr.org>
 .\" based on sensors.h, part of libsensors by Frodo Looijaard
 .\" libsensors is distributed under the GPL
@@ -25 +26 @@
 .\" References consulted:
 .\"     libsensors source code
-.TH libsensors 3  "October 2007" "lm-sensors 3" "Linux Programmer's Manual"
+.TH libsensors 3  "February 2009" "lm-sensors 3" "Linux Programmer's Manual"
 .SH NAME
 libsensors \- publicly accessible functions provided by the sensors library
@@ -58 +59 @@
 sensors_cleanup() below before calling sensors_init() again.
 
-If FILE is NULL, the default configuration file is used (see the FILES
+If FILE is NULL, the default configuration files are used (see the FILES
 section below). Most applications will want to do that.
 
@@ -181 +182 @@
 configuration file. /etc/sensors3.conf is tried first, and if it doesn't exist,
 /etc/sensors.conf is used instead.
+.RE
+
+.I /etc/sensors.d
+.RS
+A directory where you can put additional libsensors configuration files.
+Files found in this directory will be processed in alphabetical order after
+the default configuration file. Files with names that start with a dot are
+ignored.
+.RE
 
 .SH SEE ALSO

lm-sensors/trunk/lib/sensors.conf.5

@@ -1 +1 @@
 .\" Copyright (C) 1998, 1999 Adrian Baugh <adrian.baugh@keble.ox.ac.uk> and
 .\"                          Frodo Looijaard <frodol@dds.nl>
-.\" Copyright (C) 2008       Jean Delvare <khali@linux-fr.org>
+.\" Copyright (C) 2008, 2009 Jean Delvare <khali@linux-fr.org>
 .\"
 .\" Permission is granted to make and distribute verbatim copies of this
@@ -22 +22 @@
 .\" References consulted:
 .\"     sensors.conf.eg by Frodo Looijaard
-.TH sensors.conf 5  "December 2008" "lm-sensors 3" "Linux User's Manual"
+.TH sensors.conf 5  "February 2009" "lm-sensors 3" "Linux User's Manual"
 .SH NAME
 sensors.conf \- libsensors configuration file
@@ -275 +275 @@
 will generate these lines for you.
 
+In the case where multiple configuration files are used, the scope
+of each
+.I bus
+statement is the configuration file it was defined in. This makes it
+possible to have bus statements in all configuration files which will
+not unexpectedly interfere with each other.
+
 .SS STATEMENT ORDER
 
@@ -534 +541 @@
 configuration file. /etc/sensors3.conf is tried first, and if it doesn't exist,
 /etc/sensors.conf is used instead.
+.RE
+
+.I /etc/sensors.d
+.RS
+A directory where you can put additional libsensors configuration files.
+Files found in this directory will be processed in alphabetical order after
+the default configuration file. Files with names that start with a dot are
+ignored.
+.RE
 
 .SH SEE ALSO