AuxXxilium/eudev
1
0
Fork 0
mirror of https://github.com/AuxXxilium/eudev.git synced 2024-12-28 06:35:34 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

libudev: get rid of udev_sysfs.c

Browse Source
This commit is contained in:
Kay Sievers 2008-09-10 14:29:07 +02:00
parent e88a82b597
commit b21b95d722
14 changed files with 36 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
extras/ata_id/Makefile.am
View File

@ -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

1
extras/cdrom_id/Makefile.am
View File

@ -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

1
extras/edd_id/Makefile.am
View File

@ -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

4
extras/floppy/Makefile.am
View File

@ -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 = \

1
extras/fstab_import/Makefile.am
View File

@ -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

1
extras/scsi_id/Makefile.am
View File

@ -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

2
extras/usb_id/Makefile.am
View File

@ -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

1
extras/volume_id/Makefile.am
View File

@ -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

1
udev/lib/Makefile.am
View File

@ -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 = \

2
udev/lib/libudev-device.c
View File

@ -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));

2
udev/lib/libudev-enumerate.c
View File

@ -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);

1
udev/lib/libudev-private.h
View File

@ -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

31
udev/lib/libudev-utils.c
View File

@ -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;
}

5
udev/lib/libudev.c
View File

@ -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);