[PATCH] fix up segfaulting binaries with new klibc

[elogind.git] / udev_utils.c

diff --git a/udev_utils.c b/udev_utils.c
index ea4aa25c90310a3e49d4d1d16b10e053bbce200c..60f5ad859a3e58dd7fa2950f3c9d0c83b00f8939 100644 (file)
--- a/udev_utils.c
+++ b/udev_utils.c
@@ -42,52 +42,63 @@ int udev_init_device(struct udevice *udev, const char* devpath, const char *subs
        char *pos;
 
        memset(udev, 0x00, sizeof(struct udevice));
+       INIT_LIST_HEAD(&udev->symlink_list);
+
+       if (subsystem)
+               strfieldcpy(udev->subsystem, subsystem);
 
        if (devpath) {
                strfieldcpy(udev->devpath, devpath);
                no_trailing_slash(udev->devpath);
-       }
-       if (subsystem)
-               strfieldcpy(udev->subsystem, subsystem);
 
-       if (strcmp(udev->subsystem, "block") == 0)
-               udev->type = BLOCK;
-       else if (strcmp(udev->subsystem, "net") == 0)
-               udev->type = NET;
-       else if (strncmp(udev->devpath, "/block/", 7) == 0)
-               udev->type = BLOCK;
-       else if (strncmp(udev->devpath, "/class/net/", 11) == 0)
-               udev->type = NET;
-       else if (strncmp(udev->devpath, "/class/", 7) == 0)
-               udev->type = CLASS;
+               if (strncmp(udev->devpath, "/block/", 7) == 0)
+                       udev->type = BLOCK;
+               else if (strncmp(udev->devpath, "/class/net/", 11) == 0)
+                       udev->type = NET;
+               else if (strncmp(udev->devpath, "/class/", 7) == 0)
+                       udev->type = CLASS;
+               else if (strncmp(udev->devpath, "/devices/", 9) == 0)
+                       udev->type = PHYSDEV;
+
+               /* get kernel name */
+               pos = strrchr(udev->devpath, '/');
+               if (pos) {
+                       strfieldcpy(udev->kernel_name, &pos[1]);
+                       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--;
+                       strfieldcpy(udev->kernel_number, pos);
+                       dbg("kernel_number='%s'", udev->kernel_number);
+               }
+       }
 
        udev->mode = 0660;
        strcpy(udev->owner, "root");
        strcpy(udev->group, "root");
 
-       /* get kernel name */
-       pos = strrchr(udev->devpath, '/');
-       if (pos == NULL)
-               return -1;
-       strfieldcpy(udev->kernel_name, &pos[1]);
+       return 0;
+}
 
-       /* get kernel number */
-       pos = &udev->kernel_name[strlen(udev->kernel_name)];
-       while (isdigit(pos[-1]))
-               pos--;
-       strfieldcpy(udev->kernel_number, pos);
-       dbg("kernel_number='%s'", udev->kernel_number);
-
-       /* Some block devices have '!' in their name, change that to '/' */
-       pos = udev->kernel_name;
-       while (pos[0] != '\0') {
-               if (pos[0] == '!')
-                       pos[0] = '/';
-               pos++;
-       }
+void udev_cleanup_device(struct udevice *udev)
+{
+       struct name_entry *name_loop;
+       struct name_entry *temp_loop;
 
-       dbg("kernel_name='%s'", udev->kernel_name);
-       return 0;
+       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)
@@ -260,13 +271,7 @@ void no_trailing_slash(char *path)
                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;
@@ -289,12 +294,13 @@ static int name_list_add(struct list_head *name_list, const char *name, int sort
 
        strfieldcpy(new_name->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 call_foreach_file(int (*handler_function)(struct udevice *udev, const char *string),
+                     struct udevice *udev, const char *dirname, const char *suffix)
 {
        struct dirent *ent;
        DIR *dir;
@@ -337,7 +343,7 @@ int call_foreach_file(file_fnct_t fnct, const char *dirname,
                snprintf(filename, NAME_SIZE, "%s/%s", dirname, loop_file->name);
                filename[NAME_SIZE-1] = '\0';
 
-               fnct(filename, data);
+               handler_function(udev, filename);
 
                list_del(&loop_file->node);
                free(loop_file);