[PATCH] change call_foreach_file to return a list

[elogind.git] / udev_utils.c

diff --git a/udev_utils.c b/udev_utils.c
index f2534dd331d3ade1d9da474949cdc39e44b02e4d..2b5683fda65b5801207fb8a878cac167fe32a758 100644 (file)
--- a/udev_utils.c
+++ b/udev_utils.c
@@ -31,6 +31,7 @@
 #include <sys/mman.h>
 #include <sys/utsname.h>
 
 #include <sys/mman.h>
 #include <sys/utsname.h>
 

+#include "udev_libc_wrapper.h"

 #include "udev.h"
 #include "logging.h"
 #include "udev_utils.h"
 #include "udev.h"
 #include "logging.h"
 #include "udev_utils.h"


@@ -42,27 +43,28 @@ int udev_init_device(struct udevice *udev, const char* devpath, const char *subs
        char *pos;
 
        memset(udev, 0x00, sizeof(struct udevice));
        char *pos;
 
        memset(udev, 0x00, sizeof(struct udevice));

+       INIT_LIST_HEAD(&udev->symlink_list);

 
        if (subsystem)
 
        if (subsystem)

-               strfieldcpy(udev->subsystem, subsystem);
+               strlcpy(udev->subsystem, subsystem, sizeof(udev->subsystem));

 
        if (devpath) {
 
        if (devpath) {

-               strfieldcpy(udev->devpath, devpath);
+               strlcpy(udev->devpath, devpath, sizeof(udev->devpath));

                no_trailing_slash(udev->devpath);
 
                if (strncmp(udev->devpath, "/block/", 7) == 0)
                no_trailing_slash(udev->devpath);
 
                if (strncmp(udev->devpath, "/block/", 7) == 0)

-                       udev->type = BLOCK;
+                       udev->type = DEV_BLOCK;

                else if (strncmp(udev->devpath, "/class/net/", 11) == 0)
                else if (strncmp(udev->devpath, "/class/net/", 11) == 0)

-                       udev->type = NET;
+                       udev->type = DEV_NET;

                else if (strncmp(udev->devpath, "/class/", 7) == 0)
                else if (strncmp(udev->devpath, "/class/", 7) == 0)

-                       udev->type = CLASS;
+                       udev->type = DEV_CLASS;

                else if (strncmp(udev->devpath, "/devices/", 9) == 0)
                else if (strncmp(udev->devpath, "/devices/", 9) == 0)

-                       udev->type = PHYSDEV;
+                       udev->type = DEV_DEVICE;

 
                /* get kernel name */
                pos = strrchr(udev->devpath, '/');
                if (pos) {
 
                /* get kernel name */
                pos = strrchr(udev->devpath, '/');
                if (pos) {

-                       strfieldcpy(udev->kernel_name, &pos[1]);
+                       strlcpy(udev->kernel_name, &pos[1], sizeof(udev->kernel_name));

                        dbg("kernel_name='%s'", udev->kernel_name);
 
                        /* Some block devices have '!' in their name, change that to '/' */
                        dbg("kernel_name='%s'", udev->kernel_name);
 
                        /* Some block devices have '!' in their name, change that to '/' */


@@ -77,7 +79,7 @@ int udev_init_device(struct udevice *udev, const char* devpath, const char *subs
                        pos = &udev->kernel_name[strlen(udev->kernel_name)];
                        while (isdigit(pos[-1]))
                                pos--;
                        pos = &udev->kernel_name[strlen(udev->kernel_name)];
                        while (isdigit(pos[-1]))
                                pos--;

-                       strfieldcpy(udev->kernel_number, pos);
+                       strlcpy(udev->kernel_number, pos, sizeof(udev->kernel_number));

                        dbg("kernel_number='%s'", udev->kernel_number);
                }
        }
                        dbg("kernel_number='%s'", udev->kernel_number);
                }
        }


@@ -89,6 +91,17 @@ int udev_init_device(struct udevice *udev, const char* devpath, const char *subs
        return 0;
 }
 
        return 0;
 }
 

+void udev_cleanup_device(struct udevice *udev)
+{
+       struct name_entry *name_loop;
+       struct name_entry *temp_loop;
+
+       list_for_each_entry_safe(name_loop, temp_loop, &udev->symlink_list, node) {
+               list_del(&name_loop->node);
+               free(name_loop);
+       }
+}
+

 int kernel_release_satisfactory(unsigned int version, unsigned int patchlevel, unsigned int sublevel)
 {
        static unsigned int kversion = 0;
 int kernel_release_satisfactory(unsigned int version, unsigned int patchlevel, unsigned int sublevel)
 {
        static unsigned int kversion = 0;


@@ -114,7 +127,7 @@ int kernel_release_satisfactory(unsigned int version, unsigned int patchlevel, u
 
 int create_path(const char *path)
 {
 
 int create_path(const char *path)
 {

-       char p[NAME_SIZE];
+       char p[PATH_SIZE];

        char *pos;
        struct stat stats;
 
        char *pos;
        struct stat stats;
 


@@ -164,41 +177,6 @@ int unlink_secure(const char *filename)
        return retval;
 }
 
        return retval;
 }
 

-int parse_get_pair(char **orig_string, char **left, char **right)
-{
-       char *temp;
-       char *string = *orig_string;
-
-       if (!string)
-               return -ENODEV;
-
-       /* eat any whitespace */
-       while (isspace(*string) || *string == ',')
-               ++string;
-
-       /* split based on '=' */
-       temp = strsep(&string, "=");
-       *left = temp;
-       if (!string)
-               return -ENODEV;
-
-       /* take the right side and strip off the '"' */
-       while (isspace(*string))
-               ++string;
-       if (*string == '"')
-               ++string;
-       else
-               return -ENODEV;
-
-       temp = strsep(&string, "\"");
-       if (!string || *temp == '\0')
-               return -ENODEV;
-       *right = temp;
-       *orig_string = string;
-       
-       return 0;
-}
-

 int file_map(const char *filename, char **buf, size_t *bufsize)
 {
        struct stat stats;
 int file_map(const char *filename, char **buf, size_t *bufsize)
 {
        struct stat stats;


@@ -259,13 +237,7 @@ void no_trailing_slash(char *path)
                path[--len] = '\0';
 }
 
                path[--len] = '\0';
 }
 

-struct name_entry {
-       struct list_head node;
-       char name[NAME_SIZE];
-};
-
-/* sort files in lexical order */
-static int name_list_add(struct list_head *name_list, const char *name, int sort)
+int name_list_add(struct list_head *name_list, const char *name, int sort)

 {
        struct name_entry *loop_name;
        struct name_entry *new_name;
 {
        struct name_entry *loop_name;
        struct name_entry *new_name;


@@ -286,20 +258,19 @@ static int name_list_add(struct list_head *name_list, const char *name, int sort
                return -ENOMEM;
        }
 
                return -ENOMEM;
        }
 

-       strfieldcpy(new_name->name, name);
+       strlcpy(new_name->name, name, sizeof(new_name->name));

        list_add_tail(&new_name->node, &loop_name->node);
        list_add_tail(&new_name->node, &loop_name->node);

+

        return 0;
 }
 
 /* calls function for every file found in specified directory */
        return 0;
 }
 
 /* calls function for every file found in specified directory */

-int call_foreach_file(file_fnct_t fnct, const char *dirname, const char *suffix, void *data)
+int add_matching_files(struct list_head *name_list, const char *dirname, const char *suffix)

 {
        struct dirent *ent;
        DIR *dir;
        char *ext;
 {
        struct dirent *ent;
        DIR *dir;
        char *ext;

-       struct name_entry *loop_file;
-       struct name_entry *tmp_file;
-       LIST_HEAD(file_list);
+       char filename[PATH_SIZE];

 
        dbg("open directory '%s'", dirname);
        dir = opendir(dirname);
 
        dbg("open directory '%s'", dirname);
        dir = opendir(dirname);


@@ -316,7 +287,7 @@ int call_foreach_file(file_fnct_t fnct, const char *dirname, const char *suffix,
                if ((ent->d_name[0] == '.') || (ent->d_name[0] == COMMENT_CHARACTER))
                        continue;
 
                if ((ent->d_name[0] == '.') || (ent->d_name[0] == COMMENT_CHARACTER))
                        continue;
 

-               /* look for file with specified suffix */
+               /* look for file matching with specified suffix */

                ext = strrchr(ent->d_name, '.');
                if (ext == NULL)
                        continue;
                ext = strrchr(ent->d_name, '.');
                if (ext == NULL)
                        continue;


@@ -325,20 +296,10 @@ int call_foreach_file(file_fnct_t fnct, const char *dirname, const char *suffix,
                        continue;
 
                dbg("put file '%s/%s' in list", dirname, ent->d_name);
                        continue;
 
                dbg("put file '%s/%s' in list", dirname, ent->d_name);

-               name_list_add(&file_list, ent->d_name, 1);
-       }
-
-       /* call function for every file in the list */
-       list_for_each_entry_safe(loop_file, tmp_file, &file_list, node) {
-               char filename[NAME_SIZE];
-
-               snprintf(filename, NAME_SIZE, "%s/%s", dirname, loop_file->name);
-               filename[NAME_SIZE-1] = '\0';
-
-               fnct(filename, data);

 
 

-               list_del(&loop_file->node);
-               free(loop_file);
+               snprintf(filename, sizeof(filename), "%s/%s", dirname, ent->d_name);
+               filename[sizeof(filename)-1] = '\0';
+               name_list_add(name_list, filename, 1);

        }
 
        closedir(dir);
        }
 
        closedir(dir);