alsactl: Read only *.conf files when a directory is passed via INCLUDE

When alsactl init is invoked and a directory path is passed to INCLUDE
command in the config file, read only *.conf files in that directory.
This will avoid reading backup files or invalid files that have been
created accidentally.

Also by using scandir() with alphasort(), alsactl reads the files in
alphabetical order.  Thus it's highly recommended to use some number
prefix to the file name for assuring the order.

Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/alsactl/alsactl_init.xml b/alsactl/alsactl_init.xml
index eefe9ef7393e4d6457117f9cb614191bba9c67c1..bce26f555ac649f241b3670b5b89acc3435058c5 100644 (file)
--- a/alsactl/alsactl_init.xml
+++ b/alsactl/alsactl_init.xml
@@ -474,7 +474,15 @@
             <varlistentry>
               <term><option>INCLUDE</option></term>
               <listitem>
-                <para>Include specified filename or all files in specified directory</para>
+                <para>Include the specified filename or files in specified directory.
+               </para>
+               <para>
+               When a directory is specified, only the files with the
+               extension ".conf" are read.
+               Also they are read in the alphabetical order.
+               Thus it's highly recommended to use some number prefix
+               (e.g. "01-something.conf") to assure the order of execucions.
+               </para>
               </listitem>
             </varlistentry>
 

diff --git a/alsactl/init_parse.c b/alsactl/init_parse.c
index 51b515c1941ae131d94c81f4c0c99d11411fdf3a..8a7173b4a5d78e763193d981c2b3cea72bef0402 100644 (file)
--- a/alsactl/init_parse.c
+++ b/alsactl/init_parse.c
@@ -1278,6 +1278,13 @@ static char *new_root_dir(const char *filename)
        return res;
 }
 
+/* return non-zero if the file name has the extension ".conf" */
+static int conf_name_filter(const struct dirent *d)
+{
+       char *ext = strrchr(d->d_name, '.');
+       return ext && !strcmp(ext, ".conf");
+}
+
 static int parse_line(struct space *space, char *line, size_t linesize)
 {
        char *linepos;
@@ -1480,8 +1487,7 @@ static int parse_line(struct space *space, char *line, size_t linesize)
                if (strcasecmp(key, "INCLUDE") == 0) {
                        char *rootdir, *go_to;
                        const char *filename;
-                       struct dirent *dirent;
-                       DIR *dir;
+                       struct stat st;
                        int linenum;
                        if (op != KEY_OP_ASSIGN) {
                                Perror(space, "invalid INCLUDE operation");
@@ -1498,18 +1504,27 @@ static int parse_line(struct space *space, char *line, size_t linesize)
                        go_to = space->go_to;
                        filename = space->filename;
                        linenum = space->linenum;
-                       dir = opendir(string);
-                       if (dir) {
+                       if (stat(string, &st)) {
+                               Perror(space, "invalid filename '%s'", string);
+                               continue;
+                       }
+                       if (S_ISDIR(st.st_mode)) {
+                               struct dirent **list;
+                               int i, num;
+                               num = scandir(string, &list, conf_name_filter,
+                                             alphasort);
+                               if (num < 0) {
+                                       Perror(space, "invalid directory '%s'", string);
+                                       continue;
+                               }
                                count = strlen(string);
-                               while ((dirent = readdir(dir)) != NULL) {
-                                       if (strcmp(dirent->d_name, ".") == 0 ||
-                                           strcmp(dirent->d_name, "..") == 0)
-                                               continue;
+                               for (i = 0; i < num; i++) {
                                        string[count] = '\0';
                                        strlcat(string, "/", sizeof(string));
-                                       strlcat(string, dirent->d_name, sizeof(string));
+                                       strlcat(string, list[i]->d_name, sizeof(string));
                                        space->go_to = NULL;
                                        space->rootdir = new_root_dir(string);
+                                       free(list[i]);
                                        if (space->rootdir) {
                                                err = parse(space, string);
                                                free(space->rootdir);
@@ -1522,7 +1537,7 @@ static int parse_line(struct space *space, char *line, size_t linesize)
                                        if (err)
                                                break;
                                }
-                               closedir(dir);
+                               free(list);
                        } else {
                                space->go_to = NULL;
                                space->rootdir = new_root_dir(string);