[PATCH] clarify udevinfo text

[elogind.git] / namedev_parse.c

diff --git a/namedev_parse.c b/namedev_parse.c
index 013878c67933bfa80669919c2b8272a0421109a0..defb698b26ed5962eeeb4590fd7e1c892f527a21 100644 (file)
--- a/namedev_parse.c
+++ b/namedev_parse.c
@@ -58,7 +58,6 @@ 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'",
@@ -260,6 +259,7 @@ static int namedev_parse_rules(char *filename)
                }
 
                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);
@@ -319,21 +319,21 @@ static int namedev_parse_permissions(char *filename)
                        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);
@@ -422,7 +422,7 @@ static int call_foreach_file(int parser (char *f) , char *filename, char *extens
        /* 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);
+               strfieldcat(file, loop_file->name);
                parser(file);
                list_del(&loop_file->list);
                free(loop_file);