udevadm: info - resolve devpath if symlink is given

2 files changed, 23 insertions, 1 deletions

diff --git a/udev_db.c b/udev_db.c
index 29aa0316d2..518ace9a5d 100644
--- a/udev_db.c
+++ b/udev_db.c
@@ -37,7 +37,7 @@ static size_t devpath_to_db_path(const char *devpath, char *filename, size_t len
 {
 	size_t start;
 
-	/* add location of db files */
+	/* translate to location of db file */
 	strlcpy(filename, udev_root, len);
 	start = strlcat(filename, "/"DB_DIR"/", len);
 	strlcat(filename, devpath, len);
diff --git a/udevinfo.c b/udevinfo.c
index 948aaccc36..85899cfd9d 100644
--- a/udevinfo.c
+++ b/udevinfo.c
@@ -281,6 +281,7 @@ int udevinfo(int argc, char *argv[], char *envp[])
 				strlcpy(name, &optarg[strlen(udev_root)+1], sizeof(name));
 			else
 				strlcpy(name, optarg, sizeof(name));
+			remove_trailing_chars(name, '/');
 			dbg("name: %s", name);
 			break;
 		case 'p':
@@ -289,6 +290,27 @@ int udevinfo(int argc, char *argv[], char *envp[])
 				strlcpy(path, &optarg[strlen(sysfs_path)], sizeof(path));
 			else
 				strlcpy(path, optarg, sizeof(path));
+			remove_trailing_chars(path, '/');
+
+			/* possibly resolve to real devpath */
+			if (sysfs_resolve_link(path, sizeof(path)) != 0) {
+				char temp[PATH_SIZE];
+				char *pos;
+
+				/* also check if the parent is a link */
+				strlcpy(temp, path, sizeof(temp));
+				pos = strrchr(temp, '/');
+				if (pos != 0) {
+					char tail[PATH_SIZE];
+
+					strlcpy(tail, pos, sizeof(tail));
+					pos[0] = '\0';
+					if (sysfs_resolve_link(temp, sizeof(temp)) == 0) {
+						strlcpy(path, temp, sizeof(path));
+						strlcat(path, tail, sizeof(path));
+					}
+				}
+			}
 			dbg("path: %s", path);
 			break;
 		case 'q':