X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev%2Flib%2Ftest-libudev.c;h=965da558628c620819792be1de6585b460d8e916;hb=4061ab9f4bb0bdad3858e8ef1738dc892afe9de4;hp=65d84159cea5cefb68bd1d5a27508499205f265c;hpb=90d80c2efcf63c69c05e4788b993f688302b02a4;p=elogind.git

diff --git a/udev/lib/test-libudev.c b/udev/lib/test-libudev.c
index 65d84159c..965da5586 100644
--- a/udev/lib/test-libudev.c
+++ b/udev/lib/test-libudev.c
@@ -3,18 +3,10 @@
  *
  * Copyright (C) 2008 Kay Sievers <kay.sievers@vrfy.org>
  *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  */
 
 #include <stdio.h>
@@ -53,6 +45,13 @@ static void print_device(struct udev_device *device)
 	str = udev_device_get_syspath(device);
 	printf("syspath:   '%s'\n", str);
 
+	str = udev_device_get_sysname(device);
+	printf("sysname:   '%s'\n", str);
+
+	str = udev_device_get_sysnum(device);
+	if (str != NULL)
+		printf("sysnum:    '%s'\n", str);
+
 	str = udev_device_get_devpath(device);
 	printf("devpath:   '%s'\n", str);
 
@@ -60,6 +59,10 @@ static void print_device(struct udev_device *device)
 	if (str != NULL)
 		printf("subsystem: '%s'\n", str);
 
+	str = udev_device_get_devtype(device);
+	if (str != NULL)
+		printf("devtype:   '%s'\n", str);
+
 	str = udev_device_get_driver(device);
 	if (str != NULL)
 		printf("driver:    '%s'\n", str);
@@ -90,7 +93,11 @@ static void print_device(struct udev_device *device)
 	if (count > 0)
 		printf("found %i properties\n", count);
 
-	str = udev_device_get_attr_value(device, "dev");
+	str = udev_device_get_property_value(device, "MAJOR");
+	if (str != NULL)
+		printf("MAJOR: '%s'\n", str);
+
+	str = udev_device_get_sysattr_value(device, "dev");
 	if (str != NULL)
 		printf("attr{dev}: '%s'\n", str);
 
@@ -352,6 +359,15 @@ static int test_enumerate(struct udev *udev, const char *subsystem)
 	udev_enumerate_scan_subsystems(udev_enumerate);
 	test_enumerate_print_list(udev_enumerate);
 	udev_enumerate_unref(udev_enumerate);
+
+	printf("enumerate 'property IF_FS_*=filesystem'\n");
+	udev_enumerate = udev_enumerate_new(udev);
+	if (udev_enumerate == NULL)
+		return -1;
+	udev_enumerate_add_match_property(udev_enumerate, "ID_FS*", "filesystem");
+	udev_enumerate_scan_devices(udev_enumerate);
+	test_enumerate_print_list(udev_enumerate);
+	udev_enumerate_unref(udev_enumerate);
 	return 0;
 }