chiark / gitweb /
[PATCH] change call_foreach_file to return a list
[elogind.git] / udev_utils.c
index fda1f42f7e0272c8957822a8e2be107b4ba20c9d..2b5683fda65b5801207fb8a878cac167fe32a758 100644 (file)
 #include <sys/mman.h>
 #include <sys/utsname.h>
 
+#include "udev_libc_wrapper.h"
 #include "udev.h"
 #include "logging.h"
 #include "udev_utils.h"
 #include "list.h"
 
 
-void udev_init_device(struct udevice *udev, const char* devpath, const char *subsystem)
+int udev_init_device(struct udevice *udev, const char* devpath, const char *subsystem)
 {
+       char *pos;
+
        memset(udev, 0x00, sizeof(struct udevice));
+       INIT_LIST_HEAD(&udev->symlink_list);
 
-       if (devpath)
-               strfieldcpy(udev->devpath, devpath);
        if (subsystem)
-               strfieldcpy(udev->subsystem, subsystem);
-
-       if (strcmp(udev->subsystem, "block") == 0)
-               udev->type = 'b';
-       else if (strcmp(udev->subsystem, "net") == 0)
-               udev->type = 'n';
-       else if (strncmp(udev->devpath, "/block/", 7) == 0)
-               udev->type = 'b';
-       else if (strncmp(udev->devpath, "/class/net/", 11) == 0)
-               udev->type = 'n';
-       else if (strncmp(udev->devpath, "/class/", 7) == 0)
-               udev->type = 'c';
+               strlcpy(udev->subsystem, subsystem, sizeof(udev->subsystem));
+
+       if (devpath) {
+               strlcpy(udev->devpath, devpath, sizeof(udev->devpath));
+               no_trailing_slash(udev->devpath);
+
+               if (strncmp(udev->devpath, "/block/", 7) == 0)
+                       udev->type = DEV_BLOCK;
+               else if (strncmp(udev->devpath, "/class/net/", 11) == 0)
+                       udev->type = DEV_NET;
+               else if (strncmp(udev->devpath, "/class/", 7) == 0)
+                       udev->type = DEV_CLASS;
+               else if (strncmp(udev->devpath, "/devices/", 9) == 0)
+                       udev->type = DEV_DEVICE;
+
+               /* get kernel name */
+               pos = strrchr(udev->devpath, '/');
+               if (pos) {
+                       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 '/' */
+                       pos = udev->kernel_name;
+                       while (pos[0] != '\0') {
+                               if (pos[0] == '!')
+                                       pos[0] = '/';
+                               pos++;
+                       }
+
+                       /* get kernel number */
+                       pos = &udev->kernel_name[strlen(udev->kernel_name)];
+                       while (isdigit(pos[-1]))
+                               pos--;
+                       strlcpy(udev->kernel_number, pos, sizeof(udev->kernel_number));
+                       dbg("kernel_number='%s'", udev->kernel_number);
+               }
+       }
 
        udev->mode = 0660;
        strcpy(udev->owner, "root");
        strcpy(udev->group, "root");
+
+       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)
@@ -87,7 +127,7 @@ int kernel_release_satisfactory(unsigned int version, unsigned int patchlevel, u
 
 int create_path(const char *path)
 {
-       char p[NAME_SIZE];
+       char p[PATH_SIZE];
        char *pos;
        struct stat stats;
 
@@ -137,41 +177,6 @@ int unlink_secure(const char *filename)
        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;
@@ -232,44 +237,40 @@ void no_trailing_slash(char *path)
                path[--len] = '\0';
 }
 
-struct files {
-       struct list_head list;
-       char name[NAME_SIZE];
-};
-
-/* sort files in lexical order */
-static int file_list_insert(char *filename, struct list_head *file_list)
+int name_list_add(struct list_head *name_list, const char *name, int sort)
 {
-       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;
+       struct name_entry *loop_name;
+       struct name_entry *new_name;
+
+       list_for_each_entry(loop_name, name_list, node) {
+               /* avoid doubles */
+               if (strcmp(loop_name->name, name) == 0) {
+                       dbg("'%s' is already in the list", name);
+                       return 0;
                }
+               if (sort && strcmp(loop_name->name, name) > 0)
+                       break;
        }
 
-       new_file = malloc(sizeof(struct files));
-       if (new_file == NULL) {
+       new_name = malloc(sizeof(struct name_entry));
+       if (new_name == NULL) {
                dbg("error malloc");
                return -ENOMEM;
        }
 
-       strfieldcpy(new_file->name, filename);
-       list_add_tail(&new_file->list, &loop_file->list);
+       strlcpy(new_name->name, name, sizeof(new_name->name));
+       list_add_tail(&new_name->node, &loop_name->node);
+
        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 files *loop_file;
-       struct files *tmp_file;
-       LIST_HEAD(file_list);
+       char filename[PATH_SIZE];
 
        dbg("open directory '%s'", dirname);
        dir = opendir(dirname);
@@ -286,7 +287,7 @@ int call_foreach_file(file_fnct_t fnct, const char *dirname,
                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;
@@ -295,20 +296,10 @@ int call_foreach_file(file_fnct_t fnct, const char *dirname,
                        continue;
 
                dbg("put file '%s/%s' in list", dirname, ent->d_name);
-               file_list_insert(ent->d_name, &file_list);
-       }
-
-       /* call function for every file in the list */
-       list_for_each_entry_safe(loop_file, tmp_file, &file_list, list) {
-               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->list);
-               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);