summaryrefslogtreecommitdiff
path: root/udev/udev_node.c
diff options
context:
space:
mode:
Diffstat (limited to 'udev/udev_node.c')
-rw-r--r--udev/udev_node.c469
1 files changed, 275 insertions, 194 deletions
diff --git a/udev/udev_node.c b/udev/udev_node.c
index a43e5bd63f..425764242a 100644
--- a/udev/udev_node.c
+++ b/udev/udev_node.c
@@ -32,68 +32,108 @@
#define TMP_FILE_EXT ".udev-tmp"
-int udev_node_mknod(struct udevice *udevice, const char *file, dev_t devt, mode_t mode, uid_t uid, gid_t gid)
+/* reverse mapping from the device file name to the devpath */
+static int name_index(struct udev *udev, const char *devpath, const char *name, int add, int test)
{
+ char device[UTIL_PATH_SIZE];
+ char filename[UTIL_PATH_SIZE * 2];
+ size_t devlen = strlen(udev_get_dev_path(udev))+1;
+ size_t start;
+ int fd;
+
+ /* directory with device name */
+ util_strlcpy(filename, udev_get_dev_path(udev), sizeof(filename));
+ start = util_strlcat(filename, "/.udev/names/", sizeof(filename));
+ util_strlcat(filename, &name[devlen], sizeof(filename));
+ util_path_encode(&filename[start], sizeof(filename) - start);
+ /* entry with the devpath */
+ util_strlcpy(device, devpath, sizeof(device));
+ util_path_encode(device, sizeof(device));
+ util_strlcat(filename, "/", sizeof(filename));
+ util_strlcat(filename, device, sizeof(filename));
+
+ if (add) {
+ info(udev, "creating index: '%s'\n", filename);
+ create_path(udev, filename);
+ fd = open(filename, O_WRONLY|O_TRUNC|O_CREAT, 0644);
+ if (fd > 0)
+ close(fd);
+ } else {
+ info(udev, "removing index: '%s'\n", filename);
+ unlink(filename);
+ delete_path(udev, filename);
+ }
+ return 0;
+}
+
+int udev_node_mknod(struct udev_device *dev, const char *file, dev_t devnum, mode_t mode, uid_t uid, gid_t gid)
+{
+ struct udev *udev = udev_device_get_udev(dev);
char file_tmp[UTIL_PATH_SIZE + sizeof(TMP_FILE_EXT)];
struct stat stats;
int preserve = 0;
int err = 0;
- if (major(devt) != 0 && strcmp(udevice->dev->subsystem, "block") == 0)
+ if (major(devnum) == 0)
+ devnum = udev_device_get_devnum(dev);
+
+ if (strcmp(udev_device_get_subsystem(dev), "block") == 0)
mode |= S_IFBLK;
else
mode |= S_IFCHR;
+ if (file == NULL)
+ file = udev_device_get_devnode(dev);
+
if (lstat(file, &stats) == 0) {
- if (((stats.st_mode & S_IFMT) == (mode & S_IFMT)) && (stats.st_rdev == devt)) {
- info(udevice->udev, "preserve file '%s', because it has correct dev_t\n", file);
+ if (((stats.st_mode & S_IFMT) == (mode & S_IFMT)) && (stats.st_rdev == devnum)) {
+ info(udev, "preserve file '%s', because it has correct dev_t\n", file);
preserve = 1;
- udev_selinux_lsetfilecon(udevice->udev, file, mode);
+ udev_selinux_lsetfilecon(udev, file, mode);
} else {
- info(udevice->udev, "atomically replace existing file '%s'\n", file);
+ info(udev, "atomically replace existing file '%s'\n", file);
util_strlcpy(file_tmp, file, sizeof(file_tmp));
util_strlcat(file_tmp, TMP_FILE_EXT, sizeof(file_tmp));
unlink(file_tmp);
- udev_selinux_setfscreatecon(udevice->udev, file_tmp, mode);
- err = mknod(file_tmp, mode, devt);
- udev_selinux_resetfscreatecon(udevice->udev);
+ udev_selinux_setfscreatecon(udev, file_tmp, mode);
+ err = mknod(file_tmp, mode, devnum);
+ udev_selinux_resetfscreatecon(udev);
if (err != 0) {
- err(udevice->udev, "mknod(%s, %#o, %u, %u) failed: %m\n",
- file_tmp, mode, major(devt), minor(devt));
+ err(udev, "mknod(%s, %#o, %u, %u) failed: %m\n",
+ file_tmp, mode, major(devnum), minor(devnum));
goto exit;
}
err = rename(file_tmp, file);
if (err != 0) {
- err(udevice->udev, "rename(%s, %s) failed: %m\n", file_tmp, file);
+ err(udev, "rename(%s, %s) failed: %m\n", file_tmp, file);
unlink(file_tmp);
}
}
} else {
- info(udevice->udev, "mknod(%s, %#o, (%u,%u))\n", file, mode, major(devt), minor(devt));
- udev_selinux_setfscreatecon(udevice->udev, file, mode);
- err = mknod(file, mode, devt);
- udev_selinux_resetfscreatecon(udevice->udev);
+ info(udev, "mknod(%s, %#o, (%u,%u))\n", file, mode, major(devnum), minor(devnum));
+ udev_selinux_setfscreatecon(udev, file, mode);
+ err = mknod(file, mode, devnum);
+ udev_selinux_resetfscreatecon(udev);
if (err != 0) {
- err(udevice->udev, "mknod(%s, %#o, (%u,%u) failed: %m\n",
- file, mode, major(devt), minor(devt));
+ err(udev, "mknod(%s, %#o, (%u,%u) failed: %m\n", file, mode, major(devnum), minor(devnum));
goto exit;
}
}
if (!preserve || stats.st_mode != mode) {
- info(udevice->udev, "chmod(%s, %#o)\n", file, mode);
+ info(udev, "chmod(%s, %#o)\n", file, mode);
err = chmod(file, mode);
if (err != 0) {
- err(udevice->udev, "chmod(%s, %#o) failed: %m\n", file, mode);
+ err(udev, "chmod(%s, %#o) failed: %m\n", file, mode);
goto exit;
}
}
if (!preserve || stats.st_uid != uid || stats.st_gid != gid) {
- info(udevice->udev, "chown(%s, %u, %u)\n", file, uid, gid);
+ info(udev, "chown(%s, %u, %u)\n", file, uid, gid);
err = chown(file, uid, gid);
if (err != 0) {
- err(udevice->udev, "chown(%s, %u, %u) failed: %m\n", file, uid, gid);
+ err(udev, "chown(%s, %u, %u) failed: %m\n", file, uid, gid);
goto exit;
}
}
@@ -101,7 +141,7 @@ exit:
return err;
}
-static int node_symlink(struct udevice *udevice, const char *node, const char *slink)
+static int node_symlink(struct udev *udev, const char *node, const char *slink)
{
struct stat stats;
char target[UTIL_PATH_SIZE] = "";
@@ -109,7 +149,7 @@ static int node_symlink(struct udevice *udevice, const char *node, const char *s
int i = 0;
int tail = 0;
int len;
- int retval = 0;
+ int err = 0;
/* use relative link */
while (node[i] && (node[i] == slink[i])) {
@@ -129,316 +169,357 @@ static int node_symlink(struct udevice *udevice, const char *node, const char *s
if (S_ISBLK(stats.st_mode) || S_ISCHR(stats.st_mode)) {
struct stat stats2;
- info(udevice->udev, "found existing node instead of symlink '%s'\n", slink);
+ info(udev, "found existing node instead of symlink '%s'\n", slink);
if (lstat(node, &stats2) == 0) {
if ((stats.st_mode & S_IFMT) == (stats2.st_mode & S_IFMT) &&
stats.st_rdev == stats2.st_rdev) {
- info(udevice->udev, "replace device node '%s' with symlink to our node '%s'\n", slink, node);
+ info(udev, "replace device node '%s' with symlink to our node '%s'\n",
+ slink, node);
} else {
- err(udevice->udev, "device node '%s' already exists, link to '%s' will not overwrite it\n", slink, node);
+ err(udev, "device node '%s' already exists, "
+ "link to '%s' will not overwrite it\n",
+ slink, node);
goto exit;
}
}
} else if (S_ISLNK(stats.st_mode)) {
char buf[UTIL_PATH_SIZE];
- info(udevice->udev, "found existing symlink '%s'\n", slink);
+ info(udev, "found existing symlink '%s'\n", slink);
len = readlink(slink, buf, sizeof(buf));
if (len > 0) {
buf[len] = '\0';
if (strcmp(target, buf) == 0) {
- info(udevice->udev, "preserve already existing symlink '%s' to '%s'\n", slink, target);
- udev_selinux_lsetfilecon(udevice->udev, slink, S_IFLNK);
+ info(udev, "preserve already existing symlink '%s' to '%s'\n",
+ slink, target);
+ udev_selinux_lsetfilecon(udev, slink, S_IFLNK);
goto exit;
}
}
}
} else {
- info(udevice->udev, "creating symlink '%s' to '%s'\n", slink, target);
- udev_selinux_setfscreatecon(udevice->udev, slink, S_IFLNK);
- retval = symlink(target, slink);
- udev_selinux_resetfscreatecon(udevice->udev);
- if (retval == 0)
+ info(udev, "creating symlink '%s' to '%s'\n", slink, target);
+ udev_selinux_setfscreatecon(udev, slink, S_IFLNK);
+ err = symlink(target, slink);
+ udev_selinux_resetfscreatecon(udev);
+ if (err == 0)
goto exit;
}
- info(udevice->udev, "atomically replace '%s'\n", slink);
+ info(udev, "atomically replace '%s'\n", slink);
util_strlcpy(slink_tmp, slink, sizeof(slink_tmp));
util_strlcat(slink_tmp, TMP_FILE_EXT, sizeof(slink_tmp));
unlink(slink_tmp);
- udev_selinux_setfscreatecon(udevice->udev, slink, S_IFLNK);
- retval = symlink(target, slink_tmp);
- udev_selinux_resetfscreatecon(udevice->udev);
- if (retval != 0) {
- err(udevice->udev, "symlink(%s, %s) failed: %m\n", target, slink_tmp);
+ udev_selinux_setfscreatecon(udev, slink, S_IFLNK);
+ err = symlink(target, slink_tmp);
+ udev_selinux_resetfscreatecon(udev);
+ if (err != 0) {
+ err(udev, "symlink(%s, %s) failed: %m\n", target, slink_tmp);
goto exit;
}
- retval = rename(slink_tmp, slink);
- if (retval != 0) {
- err(udevice->udev, "rename(%s, %s) failed: %m\n", slink_tmp, slink);
+ err = rename(slink_tmp, slink);
+ if (err != 0) {
+ err(udev, "rename(%s, %s) failed: %m\n", slink_tmp, slink);
unlink(slink_tmp);
goto exit;
}
exit:
- return retval;
+ return err;
}
-static int update_link(struct udevice *udevice, const char *name)
+static int get_devices_by_name(struct udev *udev, const char *name, struct list_head *name_list)
{
+ char dirname[PATH_MAX];
+ size_t devlen = strlen(udev_get_dev_path(udev))+1;
+ size_t start;
+ DIR *dir;
+ int count = 0;
+
+ util_strlcpy(dirname, udev_get_dev_path(udev), sizeof(dirname));
+ start = util_strlcat(dirname, "/.udev/names/", sizeof(dirname));
+ util_strlcat(dirname, &name[devlen], sizeof(dirname));
+ util_path_encode(&dirname[start], sizeof(dirname) - start);
+
+ dir = opendir(dirname);
+ if (dir == NULL) {
+ info(udev, "no index directory '%s': %m\n", dirname);
+ count = -1;
+ goto out;
+ }
+
+ info(udev, "found index directory '%s'\n", dirname);
+ while (1) {
+ struct dirent *ent;
+ char device[UTIL_PATH_SIZE];
+
+ ent = readdir(dir);
+ if (ent == NULL || ent->d_name[0] == '\0')
+ break;
+ if (ent->d_name[0] == '.')
+ continue;
+
+ util_strlcpy(device, udev_get_sys_path(udev), sizeof(device));
+ util_strlcat(device, ent->d_name, sizeof(device));
+ util_path_decode(device);
+ name_list_add(udev, name_list, device, 0);
+ count++;
+ }
+ closedir(dir);
+out:
+ return count;
+}
+
+static int update_link(struct udev_device *dev, const char *slink, int test)
+{
+ struct udev *udev = udev_device_get_udev(dev);
LIST_HEAD(name_list);
- char slink[UTIL_PATH_SIZE];
- char node[UTIL_PATH_SIZE];
- struct udevice *udevice_db;
struct name_entry *device;
char target[UTIL_PATH_SIZE] = "";
int count;
int priority = 0;
int rc = 0;
- util_strlcpy(slink, udev_get_dev_path(udevice->udev), sizeof(slink));
- util_strlcat(slink, "/", sizeof(slink));
- util_strlcat(slink, name, sizeof(slink));
+ info(udev, "update symlink '%s' of '%s'\n", slink, udev_device_get_syspath(dev));
- count = udev_db_get_devices_by_name(udevice->udev, name, &name_list);
- info(udevice->udev, "found %i devices with name '%s'\n", count, name);
+ count = get_devices_by_name(udev, slink, &name_list);
+ info(udev, "found %i devices with name '%s'\n", count, slink);
/* if we don't have a reference, delete it */
if (count <= 0) {
- info(udevice->udev, "no reference left, remove '%s'\n", name);
- if (!udevice->test_run) {
+ info(udev, "no reference left, remove '%s'\n", slink);
+ if (!test) {
unlink(slink);
- delete_path(udevice->udev, slink);
+ delete_path(udev, slink);
}
goto out;
}
/* find the device with the highest priority */
list_for_each_entry(device, &name_list, node) {
- info(udevice->udev, "found '%s' for '%s'\n", device->name, name);
+ struct udev_device *dev_db;
+ const char *devnode;
+
+ info(udev, "found '%s' for '%s'\n", device->name, slink);
/* did we find ourself? we win, if we have the same priority */
- if (strcmp(udevice->dev->devpath, device->name) == 0) {
- info(udevice->udev, "compare (our own) priority of '%s' %i >= %i\n",
- udevice->dev->devpath, udevice->link_priority, priority);
- if (strcmp(udevice->name, name) == 0) {
- info(udevice->udev, "'%s' is our device node, database inconsistent, skip link update\n", udevice->name);
- } else if (target[0] == '\0' || udevice->link_priority >= priority) {
- priority = udevice->link_priority;
- util_strlcpy(target, udevice->name, sizeof(target));
+ if (strcmp(udev_device_get_syspath(dev), device->name) == 0) {
+ info(udev, "compare (our own) priority of '%s' %i >= %i\n",
+ udev_device_get_devpath(dev), udev_device_get_devlink_priority(dev), priority);
+ if (strcmp(udev_device_get_devnode(dev), slink) == 0) {
+ info(udev, "'%s' is our device node, database inconsistent, skip link update\n",
+ udev_device_get_devnode(dev));
+ } else if (target[0] == '\0' || udev_device_get_devlink_priority(dev) >= priority) {
+ priority = udev_device_get_devlink_priority(dev);
+ util_strlcpy(target, udev_device_get_devnode(dev), sizeof(target));
}
continue;
}
/* another device, read priority from database */
- udevice_db = udev_device_init(udevice->udev);
- if (udevice_db == NULL)
+ dev_db = udev_device_new_from_syspath(udev, device->name);
+ if (dev_db == NULL)
continue;
- if (udev_db_get_device(udevice_db, device->name) == 0) {
- if (strcmp(udevice_db->name, name) == 0) {
- info(udevice->udev, "'%s' is a device node of '%s', skip link update\n", udevice_db->name, device->name);
+ devnode = udev_device_get_devnode(dev_db);
+ if (devnode != NULL) {
+ if (strcmp(devnode, slink) == 0) {
+ info(udev, "'%s' is a device node of '%s', skip link update\n",
+ devnode, device->name);
} else {
- info(udevice->udev, "compare priority of '%s' %i > %i\n",
- udevice_db->dev->devpath, udevice_db->link_priority, priority);
- if (target[0] == '\0' || udevice_db->link_priority > priority) {
- priority = udevice_db->link_priority;
- util_strlcpy(target, udevice_db->name, sizeof(target));
+ info(udev, "compare priority of '%s' %i > %i\n",
+ udev_device_get_devpath(dev_db),
+ udev_device_get_devlink_priority(dev_db),
+ priority);
+ if (target[0] == '\0' || udev_device_get_devlink_priority(dev_db) > priority) {
+ priority = udev_device_get_devlink_priority(dev_db);
+ util_strlcpy(target, devnode, sizeof(target));
}
}
}
- udev_device_cleanup(udevice_db);
+ udev_device_unref(dev_db);
}
- name_list_cleanup(udevice->udev, &name_list);
+ name_list_cleanup(udev, &name_list);
if (target[0] == '\0') {
- info(udevice->udev, "no current target for '%s' found\n", name);
+ info(udev, "no current target for '%s' found\n", slink);
rc = 1;
goto out;
}
/* create symlink to the target with the highest priority */
- util_strlcpy(node, udev_get_dev_path(udevice->udev), sizeof(node));
- util_strlcat(node, "/", sizeof(node));
- util_strlcat(node, target, sizeof(node));
- info(udevice->udev, "'%s' with target '%s' has the highest priority %i, create it\n", name, target, priority);
- if (!udevice->test_run) {
- create_path(udevice->udev, slink);
- node_symlink(udevice, node, slink);
+ info(udev, "'%s' with target '%s' has the highest priority %i, create it\n", slink, target, priority);
+ if (!test) {
+ create_path(udev, slink);
+ node_symlink(udev, target, slink);
}
out:
return rc;
}
-void udev_node_update_symlinks(struct udevice *udevice, struct udevice *udevice_old)
+void udev_node_update_old_links(struct udev_device *dev, struct udev_device *dev_old, int test)
{
- struct name_entry *name_loop;
- char symlinks[UTIL_PATH_SIZE] = "";
-
- list_for_each_entry(name_loop, &udevice->symlink_list, node) {
- info(udevice->udev, "update symlink '%s' of '%s'\n", name_loop->name, udevice->dev->devpath);
- update_link(udevice, name_loop->name);
- util_strlcat(symlinks, udev_get_dev_path(udevice->udev), sizeof(symlinks));
- util_strlcat(symlinks, "/", sizeof(symlinks));
- util_strlcat(symlinks, name_loop->name, sizeof(symlinks));
- util_strlcat(symlinks, " ", sizeof(symlinks));
+ struct udev *udev = udev_device_get_udev(dev);
+ struct udev_list_entry *list_entry;
+ const char *devnode_old;
+
+ /* update possible left-over symlinks */
+ udev_list_entry_foreach(list_entry, udev_device_get_devlinks_list_entry(dev_old)) {
+ struct udev_list_entry *list_entry_current;
+
+ udev_list_entry_foreach(list_entry_current, udev_device_get_devlinks_list_entry(dev)) {
+ if (strcmp(udev_list_entry_get_name(list_entry_current),
+ udev_list_entry_get_name(list_entry)) == 0)
+ continue;
+ }
+ /* link does no longer belong to this device */
+ info(udev, "update old symlink '%s' no longer belonging to '%s'\n",
+ udev_list_entry_get_name(list_entry), udev_device_get_devpath(dev));
+ update_link(dev, udev_list_entry_get_name(list_entry), test);
}
- /* export symlinks to environment */
- util_remove_trailing_chars(symlinks, ' ');
- if (symlinks[0] != '\0')
- setenv("DEVLINKS", symlinks, 1);
-
- /* update possible left-over symlinks (device metadata changed) */
- if (udevice_old != NULL) {
- struct name_entry *link_loop;
- struct name_entry *link_old_loop;
- int found;
-
- /* remove current symlinks from old list */
- list_for_each_entry(link_old_loop, &udevice_old->symlink_list, node) {
- found = 0;
- list_for_each_entry(link_loop, &udevice->symlink_list, node) {
- if (strcmp(link_old_loop->name, link_loop->name) == 0) {
- found = 1;
- break;
- }
- }
- if (!found) {
- /* link does no longer belong to this device */
- info(udevice->udev, "update old symlink '%s' no longer belonging to '%s'\n",
- link_old_loop->name, udevice->dev->devpath);
- update_link(udevice, link_old_loop->name);
- }
- }
+ /*
+ * if the node name has changed, delete the node,
+ * and possibly restore a symlink of another device
+ */
+ devnode_old = udev_device_get_devnode(dev_old);
+ if (devnode_old != NULL) {
+ const char *devnode = udev_device_get_devnode(dev);
- /*
- * if the node name has changed, delete the node,
- * or possibly restore a symlink of another device
- */
- if (strcmp(udevice->name, udevice_old->name) != 0)
- update_link(udevice, udevice_old->name);
+ if (devnode != NULL && strcmp(devnode_old, devnode) != 0)
+ update_link(dev, devnode_old, test);
}
}
-int udev_node_add(struct udevice *udevice)
+int udev_node_add(struct udev_device *dev, mode_t mode, const char *owner, const char *group, int test)
{
- char filename[UTIL_PATH_SIZE];
+ struct udev *udev = udev_device_get_udev(dev);
uid_t uid;
gid_t gid;
int i;
- int retval = 0;
+ int num;
+ struct udev_list_entry *list_entry;
+ int err = 0;
- util_strlcpy(filename, udev_get_dev_path(udevice->udev), sizeof(filename));
- util_strlcat(filename, "/", sizeof(filename));
- util_strlcat(filename, udevice->name, sizeof(filename));
- create_path(udevice->udev, filename);
+ create_path(udev, udev_device_get_devnode(dev));
- if (strcmp(udevice->owner, "root") == 0)
+ if (strcmp(owner, "root") == 0)
uid = 0;
else {
char *endptr;
unsigned long id;
- id = strtoul(udevice->owner, &endptr, 10);
+ id = strtoul(owner, &endptr, 10);
if (endptr[0] == '\0')
uid = (uid_t) id;
else
- uid = lookup_user(udevice->udev, udevice->owner);
+ uid = lookup_user(udev, owner);
}
- if (strcmp(udevice->group, "root") == 0)
+ if (strcmp(group, "root") == 0)
gid = 0;
else {
char *endptr;
unsigned long id;
- id = strtoul(udevice->group, &endptr, 10);
+ id = strtoul(group, &endptr, 10);
if (endptr[0] == '\0')
gid = (gid_t) id;
else
- gid = lookup_group(udevice->udev, udevice->group);
+ gid = lookup_group(udev, group);
}
- info(udevice->udev, "creating device node '%s', major=%d, minor=%d, mode=%#o, uid=%d, gid=%d\n",
- filename, major(udevice->devt), minor(udevice->devt), udevice->mode, uid, gid);
+ info(udev, "creating device node '%s', devnum=%d:%d, mode=%#o, uid=%d, gid=%d\n",
+ udev_device_get_devnode(dev),
+ major(udev_device_get_devnum(dev)), minor(udev_device_get_devnum(dev)),
+ mode, uid, gid);
- if (!udevice->test_run)
- if (udev_node_mknod(udevice, filename, udevice->devt, udevice->mode, uid, gid) != 0) {
- retval = -1;
+ if (!test)
+ if (udev_node_mknod(dev, NULL, makedev(0,0), mode, uid, gid) != 0) {
+ err = -1;
goto exit;
}
- setenv("DEVNAME", filename, 1);
-
/* create all_partitions if requested */
- if (udevice->partitions) {
- char partitionname[UTIL_PATH_SIZE];
- char *attr;
- int range;
-
- /* take the maximum registered minor range */
- attr = sysfs_attr_get_value(udevice->udev, udevice->dev->devpath, "range");
- if (attr != NULL) {
- range = atoi(attr);
- if (range > 1)
- udevice->partitions = range-1;
- }
- info(udevice->udev, "creating device partition nodes '%s[1-%i]'\n", filename, udevice->partitions);
- if (!udevice->test_run) {
- for (i = 1; i <= udevice->partitions; i++) {
- dev_t part_devt;
-
- snprintf(partitionname, sizeof(partitionname), "%s%d", filename, i);
+ num = udev_device_get_num_fake_partitions(dev);
+ if (num > 0) {
+ info(udev, "creating device partition nodes '%s[1-%i]'\n", udev_device_get_devnode(dev), num);
+ if (!test) {
+ for (i = 1; i <= num; i++) {
+ char partitionname[UTIL_PATH_SIZE];
+ dev_t part_devnum;
+
+ snprintf(partitionname, sizeof(partitionname), "%s%d",
+ udev_device_get_devnode(dev), i);
partitionname[sizeof(partitionname)-1] = '\0';
- part_devt = makedev(major(udevice->devt), minor(udevice->devt) + i);
- udev_node_mknod(udevice, partitionname, part_devt, udevice->mode, uid, gid);
+ part_devnum = makedev(major(udev_device_get_devnum(dev)),
+ minor(udev_device_get_devnum(dev)) + i);
+ udev_node_mknod(dev, partitionname, part_devnum, mode, uid, gid);
}
}
}
+
+ /* add node and to name index */
+ name_index(udev, udev_device_get_devpath(dev), udev_device_get_devnode(dev), 1, test);
+
+ /* create/update symlinks, add symlinks to name index */
+ udev_list_entry_foreach(list_entry, udev_device_get_devlinks_list_entry(dev)) {
+ name_index(udev, udev_device_get_devpath(dev), udev_list_entry_get_name(list_entry), 1, test);
+ update_link(dev, udev_list_entry_get_name(list_entry), test);
+ }
exit:
- return retval;
+ return err;
}
-int udev_node_remove(struct udevice *udevice)
+extern int udev_node_remove(struct udev_device *dev, int test)
{
- char filename[UTIL_PATH_SIZE];
+ struct udev *udev = udev_device_get_udev(dev);
+ struct udev_list_entry *list_entry;
+ const char *devnode;
char partitionname[UTIL_PATH_SIZE];
struct stat stats;
- int retval = 0;
+ int err = 0;
int num;
- util_strlcpy(filename, udev_get_dev_path(udevice->udev), sizeof(filename));
- util_strlcat(filename, "/", sizeof(filename));
- util_strlcat(filename, udevice->name, sizeof(filename));
- if (stat(filename, &stats) != 0) {
- info(udevice->udev, "device node '%s' not found\n", filename);
+ /* remove node from name index */
+ name_index(udev, udev_device_get_devpath(dev), udev_device_get_devnode(dev), 0, test);
+
+ /* remove,update symlinks, remove symlinks from name index */
+ udev_list_entry_foreach(list_entry, udev_device_get_devlinks_list_entry(dev)) {
+ name_index(udev, udev_device_get_devpath(dev), udev_list_entry_get_name(list_entry), 0, test);
+ update_link(dev, udev_list_entry_get_name(list_entry), test);
+ }
+
+ devnode = udev_device_get_devnode(dev);
+ if (devnode == NULL)
+ return 0;
+ if (stat(devnode, &stats) != 0) {
+ info(udev, "device node '%s' not found\n", devnode);
return 0;
}
- if (udevice->devt && stats.st_rdev != udevice->devt) {
- info(udevice->udev, "device node '%s' points to a different device, skip removal\n", filename);
+ if (stats.st_rdev != udev_device_get_devnum(dev)) {
+ info(udev, "device node '%s' points to a different device, skip removal\n", devnode);
return -1;
}
- info(udevice->udev, "removing device node '%s'\n", filename);
- if (!udevice->test_run)
- retval = unlink_secure(udevice->udev, filename);
- if (retval)
- return retval;
+ info(udev, "removing device node '%s'\n", devnode);
+ if (!test)
+ err = unlink_secure(udev, devnode);
+ if (err)
+ return err;
- setenv("DEVNAME", filename, 1);
- num = udevice->partitions;
+ num = udev_device_get_num_fake_partitions(dev);
if (num > 0) {
int i;
- info(udevice->udev, "removing all_partitions '%s[1-%i]'\n", filename, num);
+ info(udev, "removing all_partitions '%s[1-%i]'\n", devnode, num);
if (num > 255)
return -1;
for (i = 1; i <= num; i++) {
- snprintf(partitionname, sizeof(partitionname), "%s%d", filename, i);
+ snprintf(partitionname, sizeof(partitionname), "%s%d", devnode, i);
partitionname[sizeof(partitionname)-1] = '\0';
- if (!udevice->test_run)
- unlink_secure(udevice->udev, partitionname);
+ if (!test)
+ unlink_secure(udev, partitionname);
}
}
- delete_path(udevice->udev, filename);
- return retval;
+ delete_path(udev, devnode);
+ return err;
}
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2025-01-17 12:57:48 +0000