From: Kay Sievers <kay.sievers@vrfy.org>
Date: Thu, 16 Aug 2007 10:45:31 +0000 (+0200)
Subject: accept relative path for TEST
X-Git-Tag: 174~1852
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=03f65fe6a9cd32a5861b1a929cdf4f7eddbd593f;p=systemd

accept relative path for TEST
---

diff --git a/test/udev-test.pl b/test/udev-test.pl
index 53499d88..fe1c6da4 100755
--- a/test/udev-test.pl
+++ b/test/udev-test.pl
@@ -1568,6 +1568,34 @@ EOF
 		exp_name	=> "00:e0:00:fb:04:e1",
 		rules		=> <<EOF
 KERNEL=="sda", NAME="\$attr{[net/eth0]address}"
+EOF
+	},
+	{
+		desc		=> "TEST absolute path",
+		subsys		=> "block",
+		devpath		=> "/block/sda",
+		exp_name	=> "there",
+		rules		=> <<EOF
+TEST=="/etc/hosts", NAME="there"
+NAME="notthere"
+EOF
+	},
+	{
+		desc		=> "TEST subsys/kernel lookup",
+		subsys		=> "block",
+		devpath		=> "/block/sda",
+		exp_name	=> "yes",
+		rules		=> <<EOF
+KERNEL=="sda", TEST=="[net/eth0]", NAME="yes"
+EOF
+	},
+	{
+		desc		=> "TEST relative path",
+		subsys		=> "block",
+		devpath		=> "/block/sda",
+		exp_name	=> "relative",
+		rules		=> <<EOF
+KERNEL=="sda", TEST=="size", NAME="relative"
 EOF
 	},
 );
diff --git a/udev_rules.c b/udev_rules.c
index e2877abe..0dcbf156 100644
--- a/udev_rules.c
+++ b/udev_rules.c
@@ -1003,6 +1003,14 @@ static int match_rule(struct udevice *udev, struct udev_rule *rule)
 				strlcat(filename, "/", sizeof(filename));
 				strlcat(filename, attr, sizeof(filename));
 			}
+		} else if (filename[0] != '/') {
+			char tmp[PATH_SIZE];
+
+			strlcpy(tmp, sysfs_path, sizeof(tmp));
+			strlcat(tmp, udev->dev->devpath, sizeof(tmp));
+			strlcat(tmp, "/", sizeof(tmp));
+			strlcat(tmp, filename, sizeof(tmp));
+			strlcpy(filename, tmp, sizeof(filename));
 		}
 
 		match = (stat(filename, &statbuf) == 0);