diff options
author | Andriy Gapon <avg@FreeBSD.org> | 2021-11-27 18:49:08 +0000 |
---|---|---|
committer | Andriy Gapon <avg@FreeBSD.org> | 2022-02-16 07:52:53 +0000 |
commit | e32acf95ea25ca2f6faf92fff2acfba298dfa378 (patch) | |
tree | d0b563632a4bf107be4431fb9839776275e3fb52 | |
parent | bd8bde138531bc28f6be861ac3f39b7ac89c64b6 (diff) | |
download | src-e32acf95ea25.tar.gz src-e32acf95ea25.zip |
cam_get_device: resolve path links before parsing device name
The CAM subsystem uses bus:taget:lun tuple to address peripherals. But
for convenience many userland programs such as camcontrol accept devices
names such as da0. There is a libcam function, cam_open_device, to
support that. It first calls cam_get_device() to parse the device name
as a driver name and a unit (and handle some special device name
prefixes) and then uses cam_lookup_pass() to find a matching pass
device.
This change extends cam_get_device() to apply realpath(3) to the device
name before parsing it. This will allow to use tools such as camcontrol
and smartctl with symbolic links that could be friendlier (more
distinguished) names for devices.
Relnotes: maybe
(cherry picked from commit 1abf1e8c6b13f50eed08fef6fb1ade280894f1e4)
-rw-r--r-- | lib/libcam/camlib.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/lib/libcam/camlib.c b/lib/libcam/camlib.c index 438b0e502fe0..6ebdb30ab82b 100644 --- a/lib/libcam/camlib.c +++ b/lib/libcam/camlib.c @@ -128,10 +128,13 @@ cam_get_device(const char *path, char *dev_name, int devnamelen, int *unit) } /* - * We can be rather destructive to the path string. Make a copy of - * it so we don't hose the user's string. + * Resolve the given path to a real device path in case we are given + * an alias or other symbolic link. If the path cannot be resolved + * then try to parse it as is. */ - newpath = (char *)strdup(path); + newpath = realpath(path, NULL); + if (newpath == NULL) + newpath = strdup(path); if (newpath == NULL) return (-1); |