summaryrefslogtreecommitdiff
path: root/namedev_parse.c
diff options
context:
space:
mode:
Diffstat (limited to 'namedev_parse.c')
-rw-r--r--namedev_parse.c107
1 files changed, 98 insertions, 9 deletions
diff --git a/namedev_parse.c b/namedev_parse.c
index d5d2181cb6..013878c679 100644
--- a/namedev_parse.c
+++ b/namedev_parse.c
@@ -33,12 +33,16 @@
#include <fcntl.h>
#include <ctype.h>
#include <unistd.h>
+#include <sys/stat.h>
+#include <dirent.h>
#include <errno.h>
#include "udev.h"
#include "logging.h"
#include "namedev.h"
+LIST_HEAD(file_list);
+
static int add_config_dev(struct config_device *new_dev)
{
struct config_device *tmp_dev;
@@ -114,7 +118,7 @@ static char *get_key_attribute(char *str)
return NULL;
}
-int namedev_init_rules(void)
+static int namedev_parse_rules(char *filename)
{
char line[255];
int lineno;
@@ -127,11 +131,11 @@ int namedev_init_rules(void)
int retval = 0;
struct config_device dev;
- fd = fopen(udev_rules_filename, "r");
+ fd = fopen(filename, "r");
if (fd != NULL) {
- dbg("reading '%s' as rules file", udev_rules_filename);
+ dbg("reading '%s' as rules file", filename);
} else {
- dbg("can't open '%s' as a rules file", udev_rules_filename);
+ dbg("can't open '%s' as a rules file", filename);
return -ENODEV;
}
@@ -262,7 +266,7 @@ int namedev_init_rules(void)
continue;
error:
dbg("%s:%d:%d: parse error, rule skipped",
- udev_rules_filename, lineno, temp - line);
+ filename, lineno, temp - line);
}
}
exit:
@@ -270,7 +274,7 @@ exit:
return retval;
}
-int namedev_init_permissions(void)
+static int namedev_parse_permissions(char *filename)
{
char line[255];
char *temp;
@@ -279,11 +283,11 @@ int namedev_init_permissions(void)
int retval = 0;
struct perm_device dev;
- fd = fopen(udev_permissions_filename, "r");
+ fd = fopen(filename, "r");
if (fd != NULL) {
- dbg("reading '%s' as permissions file", udev_permissions_filename);
+ dbg("reading '%s' as permissions file", filename);
} else {
- dbg("can't open '%s' as permissions file", udev_permissions_filename);
+ dbg("can't open '%s' as permissions file", filename);
return -ENODEV;
}
@@ -352,3 +356,88 @@ exit:
return retval;
}
+struct files {
+ struct list_head list;
+ char name[NAME_SIZE];
+};
+
+/* sort files in lexical order */
+static int file_list_insert(char *filename)
+{
+ struct files *loop_file;
+ struct files *new_file;
+
+ list_for_each_entry(loop_file, &file_list, list) {
+ if (strcmp(loop_file->name, filename) > 0) {
+ break;
+ }
+ }
+
+ new_file = malloc(sizeof(struct files));
+ if (new_file == NULL) {
+ dbg("error malloc");
+ return -ENOMEM;
+ }
+
+ strfieldcpy(new_file->name, filename);
+ list_add_tail(&new_file->list, &loop_file->list);
+ return 0;
+}
+
+/* calls function for file or every file found in directory */
+static int call_foreach_file(int parser (char *f) , char *filename, char *extension)
+{
+ struct dirent *ent;
+ DIR *dir;
+ char *ext;
+ char file[NAME_SIZE];
+ struct stat stats;
+ struct files *loop_file;
+ struct files *tmp_file;
+
+ /* look if we have a plain file or a directory to scan */
+ stat(filename, &stats);
+ if ((stats.st_mode & S_IFMT) != S_IFDIR)
+ return parser(filename);
+
+ /* sort matching filename into list */
+ dbg("open config as directory '%s'", filename);
+ dir = opendir(filename);
+ while (1) {
+ ent = readdir(dir);
+ if (ent == NULL || ent->d_name[0] == '\0')
+ break;
+
+ dbg("found file '%s'", ent->d_name);
+ ext = strrchr(ent->d_name, '.');
+ if (ext == NULL)
+ continue;
+
+ if (strcmp(ext, extension) == 0) {
+ dbg("put file in list '%s'", ent->d_name);
+ file_list_insert(ent->d_name);
+ }
+ }
+
+ /* parse every file in the list */
+ list_for_each_entry_safe(loop_file, tmp_file, &file_list, list) {
+ strfieldcpy(file, filename);
+ strcat(file, loop_file->name);
+ parser(file);
+ list_del(&loop_file->list);
+ free(loop_file);
+ }
+
+ closedir(dir);
+ return 0;
+}
+
+int namedev_init_rules()
+{
+ return call_foreach_file(namedev_parse_rules, udev_rules_filename, RULEFILE_EXT);
+}
+
+int namedev_init_permissions()
+{
+ return call_foreach_file(namedev_parse_permissions, udev_permissions_filename, PERMFILE_EXT);
+}