#include <stdlib.h>
#include <string.h>
#include <stdio.h>
-#include <fcntl.h>
#include <ctype.h>
#include <unistd.h>
#include <sys/stat.h>
-#include <dirent.h>
#include <errno.h>
#include "udev.h"
+#include "udev_lib.h"
#include "logging.h"
#include "namedev.h"
-LIST_HEAD(file_list);
static int add_config_dev(struct config_device *new_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'",
+ "owner='%s', group='%s', mode=%#o",
dev->name, dev->symlink, dev->bus, dev->place, dev->id,
dev->sysfs_pair[0].file, dev->sysfs_pair[0].value,
- dev->kernel, dev->program, dev->result);
+ dev->kernel, dev->program, dev->result,
+ dev->owner, dev->group, dev->mode);
}
void dump_config_dev_list(void)
dump_config_dev(dev);
}
+static int add_perm_dev(struct perm_device *new_dev)
+{
+ struct perm_device *dev;
+ struct perm_device *tmp_dev;
+
+ /* update the values if we already have the device */
+ list_for_each_entry(dev, &perm_device_list, node) {
+ if (strcmp(new_dev->name, dev->name) != 0)
+ continue;
+
+ set_empty_perms(dev, new_dev->mode, new_dev->owner, new_dev->group);
+ return 0;
+ }
+
+ /* not found, add new structure to the perm list */
+ tmp_dev = malloc(sizeof(*tmp_dev));
+ if (!tmp_dev)
+ return -ENOMEM;
+
+ memcpy(tmp_dev, new_dev, sizeof(*tmp_dev));
+ list_add_tail(&tmp_dev->node, &perm_device_list);
+ //dump_perm_dev(tmp_dev);
+ return 0;
+}
+
void dump_perm_dev(struct perm_device *dev)
{
dbg_parse("name='%s', owner='%s', group='%s', mode=%#o",
char *temp2;
char *temp3;
char *attr;
- FILE *fd;
+ char *buf;
+ size_t bufsize;
+ size_t cur;
+ size_t count;
int program_given = 0;
int retval = 0;
struct config_device dev;
- fd = fopen(filename, "r");
- if (fd != NULL) {
+ if (file_map(filename, &buf, &bufsize) == 0) {
dbg("reading '%s' as rules file", filename);
} else {
- dbg("can't open '%s' as a rules file", filename);
- return -ENODEV;
+ dbg("can't open '%s' as rules file", filename);
+ return -1;
}
/* loop through the whole file */
+ cur = 0;
lineno = 0;
while (1) {
- /* get a line */
- temp = fgets(line, sizeof(line), fd);
- if (temp == NULL)
- goto exit;
+ count = buf_get_line(buf, bufsize, cur);
+
+ strncpy(line, buf + cur, count);
+ line[count] = '\0';
+ temp = line;
lineno++;
+
+ cur += count+1;
+ if (cur > bufsize)
+ break;
+
dbg_parse("read '%s'", temp);
/* eat the whitespace */
continue;
}
+ if (strcasecmp(temp2, FIELD_OWNER) == 0) {
+ strfieldcpy(dev.owner, temp3);
+ continue;
+ }
+
+ if (strcasecmp(temp2, FIELD_GROUP) == 0) {
+ strfieldcpy(dev.group, temp3);
+ continue;
+ }
+
+ if (strcasecmp(temp2, FIELD_MODE) == 0) {
+ dev.mode = strtol(temp3, NULL, 8);
+ continue;
+ }
+
dbg("unknown type of field '%s'", temp2);
- dbg("You might be using a rules file in the old format, please fix.");
goto error;
}
- /* simple plausibility check for given keys */
+ /* simple plausibility checks for given keys */
if ((dev.sysfs_pair[0].file[0] == '\0') ^
(dev.sysfs_pair[0].value[0] == '\0')) {
dbg("inconsistency in " FIELD_SYSFS " key");
filename, lineno, temp - line);
}
}
-exit:
- fclose(fd);
+
+ file_unmap(buf, bufsize);
return retval;
}
char line[255];
char *temp;
char *temp2;
- FILE *fd;
+ char *buf;
+ size_t bufsize;
+ size_t cur;
+ size_t count;
int retval = 0;
struct perm_device dev;
- fd = fopen(filename, "r");
- if (fd != NULL) {
+ if (file_map(filename, &buf, &bufsize) == 0) {
dbg("reading '%s' as permissions file", filename);
} else {
dbg("can't open '%s' as permissions file", filename);
- return -ENODEV;
+ return -1;
}
/* loop through the whole file */
+ cur = 0;
while (1) {
- temp = fgets(line, sizeof(line), fd);
- if (temp == NULL)
+ count = buf_get_line(buf, bufsize, cur);
+
+ strncpy(line, buf + cur, count);
+ line[count] = '\0';
+ temp = line;
+
+ cur += count+1;
+ if (cur > bufsize)
break;
dbg_parse("read '%s'", temp);
strfieldcpy(dev.group, temp2);
if (!temp) {
- dbg("cannot parse line: %s", line);
+ dbg("cannot parse line '%s'", line);
continue;
}
dev.mode = strtol(temp, NULL, 8);
dbg_parse("name='%s', owner='%s', group='%s', mode=%#o",
- dev.name, dev.owner, dev.group,
- dev.mode);
+ dev.name, dev.owner, dev.group, dev.mode);
+
retval = add_perm_dev(&dev);
if (retval) {
dbg("add_perm_dev returned with error %d", retval);
}
exit:
- fclose(fd);
+ file_unmap(buf, bufsize);
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)
+int namedev_init_rules()
{
- 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);
+ stat(udev_rules_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);
+ return namedev_parse_rules(udev_rules_filename);
+ else
+ return call_foreach_file(namedev_parse_rules,
+ udev_rules_filename, RULEFILE_SUFFIX);
}
int namedev_init_permissions()
{
- return call_foreach_file(namedev_parse_permissions, udev_permissions_filename, PERMFILE_EXT);
+ struct stat stats;
+
+ stat(udev_permissions_filename, &stats);
+ if ((stats.st_mode & S_IFMT) != S_IFDIR)
+ return namedev_parse_permissions(udev_permissions_filename);
+ else
+ return call_foreach_file(namedev_parse_permissions,
+ udev_permissions_filename, PERMFILE_SUFFIX);
}
~ianmdlvl / elogind.git / blobdiff