summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--extras/ata_id/Makefile.am1
-rw-r--r--extras/cdrom_id/Makefile.am1
-rw-r--r--extras/edd_id/Makefile.am1
-rw-r--r--extras/floppy/Makefile.am4
-rw-r--r--extras/fstab_import/Makefile.am1
-rw-r--r--extras/scsi_id/Makefile.am1
-rw-r--r--extras/usb_id/Makefile.am2
-rw-r--r--extras/volume_id/Makefile.am1
-rw-r--r--udev/lib/Makefile.am1
-rw-r--r--udev/lib/libudev-device.c2
-rw-r--r--udev/lib/libudev-enumerate.c2
-rw-r--r--udev/lib/libudev-private.h1
-rw-r--r--udev/lib/libudev-utils.c31
-rw-r--r--udev/lib/libudev.c5
14 files changed, 36 insertions, 18 deletions
diff --git a/extras/ata_id/Makefile.am b/extras/ata_id/Makefile.am
index db5f87f8c3..f74964875b 100644
--- a/extras/ata_id/Makefile.am
+++ b/extras/ata_id/Makefile.am
@@ -12,7 +12,6 @@ ata_id_SOURCES = \
ata_id.c \
../../udev/lib/libudev.h \
../../udev/lib/libudev.c \
- ../../udev/udev_sysfs.c \
../../udev/udev_sysdeps.c \
../../udev/udev_utils.c \
../../udev/udev_utils_string.c
diff --git a/extras/cdrom_id/Makefile.am b/extras/cdrom_id/Makefile.am
index 0514a2ea51..9a39ee503a 100644
--- a/extras/cdrom_id/Makefile.am
+++ b/extras/cdrom_id/Makefile.am
@@ -15,7 +15,6 @@ cdrom_id_SOURCES = \
cdrom_id.c \
../../udev/lib/libudev.h \
../../udev/lib/libudev.c \
- ../../udev/udev_sysfs.c \
../../udev/udev_sysdeps.c \
../../udev/udev_utils.c \
../../udev/udev_utils_string.c
diff --git a/extras/edd_id/Makefile.am b/extras/edd_id/Makefile.am
index 22af7e9528..575de8514d 100644
--- a/extras/edd_id/Makefile.am
+++ b/extras/edd_id/Makefile.am
@@ -15,7 +15,6 @@ edd_id_SOURCES = \
edd_id.c \
../../udev/lib/libudev.h \
../../udev/lib/libudev.c \
- ../../udev/udev_sysfs.c \
../../udev/udev_sysdeps.c \
../../udev/udev_utils.c \
../../udev/udev_utils_string.c
diff --git a/extras/floppy/Makefile.am b/extras/floppy/Makefile.am
index a5e9c10800..44e9b2fbc0 100644
--- a/extras/floppy/Makefile.am
+++ b/extras/floppy/Makefile.am
@@ -11,11 +11,9 @@ create_floppy_devices_SOURCES = \
create_floppy_devices.c \
../../udev/lib/libudev.h \
../../udev/lib/libudev.c \
- ../../udev/udev_sysfs.c \
../../udev/udev_sysdeps.c \
../../udev/udev_utils.c \
- ../../udev/udev_utils_string.c \
- ../../udev/udev_utils_file.c
+ ../../udev/udev_utils_string.c
if USE_SELINUX
create_floppy_devices_LDADD = \
diff --git a/extras/fstab_import/Makefile.am b/extras/fstab_import/Makefile.am
index c4fbdce248..92be9a439b 100644
--- a/extras/fstab_import/Makefile.am
+++ b/extras/fstab_import/Makefile.am
@@ -15,7 +15,6 @@ fstab_import_SOURCES = \
fstab_import.c \
../../udev/lib/libudev.h \
../../udev/lib/libudev.c \
- ../../udev/udev_sysfs.c \
../../udev/udev_sysdeps.c \
../../udev/udev_utils.c \
../../udev/udev_utils_string.c
diff --git a/extras/scsi_id/Makefile.am b/extras/scsi_id/Makefile.am
index f42563f498..ffa9bf3143 100644
--- a/extras/scsi_id/Makefile.am
+++ b/extras/scsi_id/Makefile.am
@@ -15,7 +15,6 @@ scsi_id_SOURCES = \
bsg.h \
../../udev/lib/libudev.h \
../../udev/lib/libudev.c \
- ../../udev/udev_sysfs.c \
../../udev/udev_sysdeps.c \
../../udev/udev_utils.c \
../../udev/udev_utils_string.c
diff --git a/extras/usb_id/Makefile.am b/extras/usb_id/Makefile.am
index aa1c4f82b6..9eb6f16b57 100644
--- a/extras/usb_id/Makefile.am
+++ b/extras/usb_id/Makefile.am
@@ -11,8 +11,8 @@ usb_id_SOURCES = \
usb_id.c \
../../udev/lib/libudev.h \
../../udev/lib/libudev.c \
- ../../udev/udev_sysfs.c \
../../udev/udev_sysdeps.c \
+ ../../udev/udev_sysfs.c \
../../udev/udev_utils.c \
../../udev/udev_utils_string.c
diff --git a/extras/volume_id/Makefile.am b/extras/volume_id/Makefile.am
index 9fb2cba646..8560763415 100644
--- a/extras/volume_id/Makefile.am
+++ b/extras/volume_id/Makefile.am
@@ -14,7 +14,6 @@ vol_id_SOURCES = \
vol_id.c \
../../udev/lib/libudev.h \
../../udev/lib/libudev.c \
- ../../udev/udev_sysfs.c \
../../udev/udev_sysdeps.c \
../../udev/udev_utils.c \
../../udev/udev_utils_string.c
diff --git a/udev/lib/Makefile.am b/udev/lib/Makefile.am
index 33d0f633ab..a768daa817 100644
--- a/udev/lib/Makefile.am
+++ b/udev/lib/Makefile.am
@@ -32,7 +32,6 @@ libudev_la_SOURCES =\
../udev.h \
../udev_utils.c \
../udev_utils_string.c \
- ../udev_sysfs.c \
../udev_sysdeps.c
libudev_la_LDFLAGS = \
diff --git a/udev/lib/libudev-device.c b/udev/lib/libudev-device.c
index e13146599c..416cae450d 100644
--- a/udev/lib/libudev-device.c
+++ b/udev/lib/libudev-device.c
@@ -205,7 +205,7 @@ struct udev_device *udev_device_new_from_devpath(struct udev *udev, const char *
/* resolve possible symlink to real path */
strlcpy(path, devpath, sizeof(path));
- sysfs_resolve_link(udev, path, sizeof(path));
+ util_resolve_sys_link(udev, path, sizeof(path));
device_set_devpath(udev_device, path);
info(udev, "device %p has devpath '%s'\n", udev_device, udev_device_get_devpath(udev_device));
diff --git a/udev/lib/libudev-enumerate.c b/udev/lib/libudev-enumerate.c
index 1ba4de8948..f36eafaff6 100644
--- a/udev/lib/libudev-enumerate.c
+++ b/udev/lib/libudev-enumerate.c
@@ -58,7 +58,7 @@ static int devices_scan_subsystem(struct udev *udev,
strlcpy(devpath, &path[len], sizeof(devpath));
strlcat(devpath, "/", sizeof(devpath));
strlcat(devpath, dent->d_name, sizeof(devpath));
- sysfs_resolve_link(udev, devpath, sizeof(devpath));
+ util_resolve_sys_link(udev, devpath, sizeof(devpath));
name_list_add(udev, device_list, devpath, 1);
}
closedir(dir);
diff --git a/udev/lib/libudev-private.h b/udev/lib/libudev-private.h
index daa869ba42..1579df6d6e 100644
--- a/udev/lib/libudev-private.h
+++ b/udev/lib/libudev-private.h
@@ -106,4 +106,5 @@ extern int udev_ctrl_get_set_max_childs(struct udev_ctrl_msg *ctrl_msg);
/* libudev-utils */
extern ssize_t util_get_sys_subsystem(struct udev *udev, const char *devpath, char *subsystem, size_t size);
extern ssize_t util_get_sys_driver(struct udev *udev, const char *devpath, char *driver, size_t size);
+extern int util_resolve_sys_link(struct udev *udev, char *devpath, size_t size);
#endif
diff --git a/udev/lib/libudev-utils.c b/udev/lib/libudev-utils.c
index 82acb1a481..e5f1ed7c38 100644
--- a/udev/lib/libudev-utils.c
+++ b/udev/lib/libudev-utils.c
@@ -63,3 +63,34 @@ ssize_t util_get_sys_driver(struct udev *udev, const char *devpath, char *driver
return get_sys_link(udev, "driver", devpath, driver, size);
}
+int util_resolve_sys_link(struct udev *udev, char *devpath, size_t size)
+{
+ char link_path[PATH_SIZE];
+ char link_target[PATH_SIZE];
+ int len;
+ int i;
+ int back;
+
+ strlcpy(link_path, udev_get_sys_path(udev), sizeof(link_path));
+ strlcat(link_path, devpath, sizeof(link_path));
+ len = readlink(link_path, link_target, sizeof(link_target));
+ if (len <= 0)
+ return -1;
+ link_target[len] = '\0';
+ dbg(udev, "path link '%s' points to '%s'\n", devpath, link_target);
+
+ for (back = 0; strncmp(&link_target[back * 3], "../", 3) == 0; back++)
+ ;
+ dbg(udev, "base '%s', tail '%s', back %i\n", devpath, &link_target[back * 3], back);
+ for (i = 0; i <= back; i++) {
+ char *pos = strrchr(devpath, '/');
+
+ if (pos == NULL)
+ return -1;
+ pos[0] = '\0';
+ }
+ dbg(udev, "after moving back '%s'\n", devpath);
+ strlcat(devpath, "/", size);
+ strlcat(devpath, &link_target[back * 3], size);
+ return 0;
+}
diff --git a/udev/lib/libudev.c b/udev/lib/libudev.c
index 50fe0d1c89..3bcafcd9a6 100644
--- a/udev/lib/libudev.c
+++ b/udev/lib/libudev.c
@@ -295,10 +295,7 @@ struct udev *udev_new(void)
if (udev->dev_path == NULL || udev->sys_path == NULL)
goto err;
-
selinux_init(udev);
- sysfs_init();
-
info(udev, "context %p created\n", udev);
info(udev, "log_priority=%d\n", udev->log_priority);
info(udev, "config_file='%s'\n", config_file);
@@ -306,7 +303,6 @@ struct udev *udev_new(void)
info(udev, "sys_path='%s'\n", udev->sys_path);
if (udev->rules_path != NULL)
info(udev, "rules_path='%s'\n", udev->rules_path);
-
free(config_file);
return udev;
err:
@@ -347,7 +343,6 @@ void udev_unref(struct udev *udev)
udev->refcount--;
if (udev->refcount > 0)
return;
- sysfs_cleanup();
selinux_exit(udev);
free(udev->dev_path);
free(udev->sys_path);
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-11-14 21:28:33 +0000