X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev%2Flib%2Ftest-libudev.c;h=39330a74c6cbbe036370008b01db80ec598556c3;hp=b30117627f04ce9881838eab6ab4511f6b2678cf;hb=38f27948cdafd8a4b90a6b4f1f54b89891983506;hpb=b2d9e4f20075d355cd4fe091929bc336642aa50d

diff --git a/udev/lib/test-libudev.c b/udev/lib/test-libudev.c
index b30117627..39330a74c 100644
--- a/udev/lib/test-libudev.c
+++ b/udev/lib/test-libudev.c
@@ -17,8 +17,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "config.h"
-
 #include <stdio.h>
 #include <stdarg.h>
 #include <unistd.h>
@@ -56,14 +54,16 @@ static void print_device(struct udev_device *device)
 	int count;
 
 	printf("*** device: %p ***\n", device);
+	str = udev_device_get_action(device);
+	printf("action:    '%s'\n", str);
+	str = udev_device_get_syspath(device);
+	printf("syspath:   '%s'\n", str);
 	str = udev_device_get_devpath(device);
 	printf("devpath:   '%s'\n", str);
 	str = udev_device_get_subsystem(device);
 	printf("subsystem: '%s'\n", str);
 	str = udev_device_get_driver(device);
 	printf("driver:    '%s'\n", str);
-	str = udev_device_get_syspath(device);
-	printf("syspath:   '%s'\n", str);
 	str = udev_device_get_devname(device);
 	printf("devname:   '%s'\n", str);
 	count = udev_device_get_devlinks(device, print_devlinks_cb, NULL);
@@ -73,12 +73,12 @@ static void print_device(struct udev_device *device)
 	printf("\n");
 }
 
-static int test_device(struct udev *udev, const char *devpath)
+static int test_device(struct udev *udev, const char *syspath)
 {
 	struct udev_device *device;
 
-	printf("looking at device: %s\n", devpath);
-	device = udev_device_new_from_devpath(udev, devpath);
+	printf("looking at device: %s\n", syspath);
+	device = udev_device_new_from_syspath(udev, syspath);
 	if (device == NULL) {
 		printf("no device\n");
 		return -1;
@@ -88,13 +88,13 @@ static int test_device(struct udev *udev, const char *devpath)
 	return 0;
 }
 
-static int test_device_parents(struct udev *udev, const char *devpath)
+static int test_device_parents(struct udev *udev, const char *syspath)
 {
 	struct udev_device *device;
 	struct udev_device *device_parent;
 
-	printf("looking at device: %s\n", devpath);
-	device = udev_device_new_from_devpath(udev, devpath);
+	printf("looking at device: %s\n", syspath);
+	device = udev_device_new_from_syspath(udev, syspath);
 	if (device == NULL)
 		return -1;
 
@@ -114,11 +114,12 @@ static int test_device_parents(struct udev *udev, const char *devpath)
 	return 0;
 }
 
-static int devices_enum_cb(struct udev *udev,
-			   const char *devpath, const char *subsystem, const char *name,
-			   void *data)
+static int devices_enum_cb(struct udev_device *device, void *data)
 {
-	printf("device:    '%s' (%s) '%s'\n", devpath, subsystem, name);
+	printf("device:    '%s' (%s) '%s'\n",
+	       udev_device_get_syspath(device),
+	       udev_device_get_subsystem(device),
+	       udev_device_get_sysname(device));
 	return 0;
 }
 
@@ -185,7 +186,7 @@ int main(int argc, char *argv[], char *envp[])
 {
 	struct udev *udev = NULL;
 	static const struct option options[] = {
-		{ "devpath", 1, NULL, 'p' },
+		{ "syspath", 1, NULL, 'p' },
 		{ "subsystem", 1, NULL, 's' },
 		{ "socket", 1, NULL, 'S' },
 		{ "debug", 0, NULL, 'd' },
@@ -193,9 +194,10 @@ int main(int argc, char *argv[], char *envp[])
 		{ "version", 0, NULL, 'V' },
 		{}
 	};
-	const char *devpath = "/devices/virtual/mem/null";
+	const char *syspath = "/devices/virtual/mem/null";
 	const char *subsystem = NULL;
 	const char *socket = "@/org/kernel/udev/monitor";
+	char path[1024];
 	const char *str;
 
 	udev = udev_new();
@@ -216,7 +218,7 @@ int main(int argc, char *argv[], char *envp[])
 
 		switch (option) {
 		case 'p':
-			devpath = optarg;
+			syspath = optarg;
 			break;
 		case 's':
 			subsystem = optarg;
@@ -229,7 +231,7 @@ int main(int argc, char *argv[], char *envp[])
 				udev_set_log_priority(udev, LOG_INFO);
 			break;
 		case 'h':
-			printf("--debug --devpath= --subsystem= --socket= --help\n");
+			printf("--debug --syspath= --subsystem= --socket= --help\n");
 			goto out;
 		case 'V':
 			printf("%s\n", VERSION);
@@ -244,8 +246,14 @@ int main(int argc, char *argv[], char *envp[])
 	str = udev_get_dev_path(udev);
 	printf("dev_path: '%s'\n", str);
 
-	test_device(udev, devpath);
-	test_device_parents(udev, devpath);
+	/* add sys path if needed */
+	if (strncmp(syspath, udev_get_sys_path(udev), strlen(udev_get_sys_path(udev))) != 0) {
+		snprintf(path, sizeof(path), "%s%s", udev_get_sys_path(udev), syspath);
+		syspath = path;
+	}
+
+	test_device(udev, syspath);
+	test_device_parents(udev, syspath);
 	test_enumerate(udev, subsystem);
 	test_monitor(udev, socket);
 out: