#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;
void dump_config_dev(struct config_device *dev)
{
- /*FIXME dump all sysfs's */
dbg_parse("name='%s', symlink='%s', bus='%s', place='%s', id='%s', "
"sysfs_file[0]='%s', sysfs_value[0]='%s', "
"kernel='%s', program='%s', result='%s'",
char *pos;
char *attr;
- attr = strchr(str, '_');
- if (attr != NULL) {
- attr++;
- dbg("attribute='%s'", attr);
- return attr;
- }
-
attr = strchr(str, '{');
if (attr != NULL) {
attr++;
return attr;
}
+ attr = strchr(str, '_');
+ if (attr != NULL) {
+ attr++;
+ dbg("attribute='%s'", attr);
+ return attr;
+ }
+
return NULL;
}
-int namedev_init_rules(void)
+static int namedev_parse_rules(char *filename)
{
char line[255];
int lineno;
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;
}
continue;
}
- if (strcasecmp(temp2, FIELD_NAME) == 0) {
+ if (strncasecmp(temp2, FIELD_NAME, sizeof(FIELD_NAME)-1) == 0) {
+ attr = get_key_attribute(temp2 + sizeof(FIELD_NAME)-1);
+ if (attr != NULL)
+ if (strcasecmp(attr, ATTR_PARTITIONS) == 0) {
+ dbg_parse("creation of partition nodes requested");
+ dev.partitions = PARTITIONS_COUNT;
+ }
strfieldcpy(dev.name, temp3);
continue;
}
}
dev.config_line = lineno;
+ strfieldcpy(dev.config_file, filename);
retval = add_config_dev(&dev);
if (retval) {
dbg("add_config_dev returned with error %d", retval);
continue;
error:
dbg("%s:%d:%d: parse error, rule skipped",
- udev_rules_filename, lineno, temp - line);
+ filename, lineno, temp - line);
}
}
exit:
return retval;
}
-int namedev_init_permissions(void)
+static int namedev_parse_permissions(char *filename)
{
char line[255];
char *temp;
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;
}
dbg("cannot parse line '%s'", line);
continue;
}
- strncpy(dev.name, temp2, sizeof(dev.name));
+ strfieldcpy(dev.name, temp2);
temp2 = strsep(&temp, ":");
if (!temp2) {
dbg("cannot parse line '%s'", line);
continue;
}
- strncpy(dev.owner, temp2, sizeof(dev.owner));
+ strfieldcpy(dev.owner, temp2);
temp2 = strsep(&temp, ":");
if (!temp2) {
dbg("cannot parse line '%s'", line);
continue;
}
- strncpy(dev.group, temp2, sizeof(dev.group));
+ strfieldcpy(dev.group, temp2);
if (!temp) {
dbg("cannot parse line: %s", line);
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);
+ strfieldcat(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);
+}
~ianmdlvl / elogind.git / blobdiff