libudev: device - read database only when needed

[elogind.git] / udev / udev_utils.c

diff --git a/udev/udev_utils.c b/udev/udev_utils.c
index 669e4f3419fa7f78b8909ae844fe082ac3108ab9..09b965ef3bbfb5de3620b1fb3a8d93e68783db0d 100644 (file)
--- a/udev/udev_utils.c
+++ b/udev/udev_utils.c
@@ -55,7 +55,7 @@ struct name_entry *name_list_add(struct udev *udev, struct list_head *name_list,
        if (name_new == NULL)
                return NULL;
        memset(name_new, 0x00, sizeof(struct name_entry));
-       strlcpy(name_new->name, name, sizeof(name_new->name));
+       util_strlcpy(name_new->name, name, sizeof(name_new->name));
        dbg(udev, "adding '%s'\n", name_new->name);
        list_add_tail(&name_new->node, &name_loop->node);
 
@@ -127,7 +127,7 @@ int add_matching_files(struct udev *udev, struct list_head *name_list, const cha
 {
        struct dirent *ent;
        DIR *dir;
-       char filename[PATH_SIZE];
+       char filename[UTIL_PATH_SIZE];
 
        dbg(udev, "open directory '%s'\n", dirname);
        dir = opendir(dirname);
@@ -141,7 +141,7 @@ int add_matching_files(struct udev *udev, struct list_head *name_list, const cha
                if (ent == NULL || ent->d_name[0] == '\0')
                        break;
 
-               if ((ent->d_name[0] == '.') || (ent->d_name[0] == COMMENT_CHARACTER))
+               if ((ent->d_name[0] == '.') || (ent->d_name[0] == '#'))
                        continue;
 
                /* look for file matching with specified suffix */