X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=libudev%2Flibudev-enumerate.c;h=9a61a61f0d4a44d32ca78717b0c2d0c2d5766f54;hb=3c4b1738a9d591d7ddce361ea184b76b253c4e87;hp=986c1fc3d5ace0f432908764c494f638ce4661c2;hpb=3bf768245b98479a14190e1e1d32ef5fae3ddf8a;p=elogind.git

diff --git a/libudev/libudev-enumerate.c b/libudev/libudev-enumerate.c
index 986c1fc3d..9a61a61f0 100644
--- a/libudev/libudev-enumerate.c
+++ b/libudev/libudev-enumerate.c
@@ -251,7 +251,7 @@ struct udev_list_entry *udev_enumerate_get_list_entry(struct udev_enumerate *ude
 		unsigned int i;
 		unsigned int max;
 		struct syspath *prev = NULL, *move_later = NULL;
-		size_t move_later_prefix;
+		size_t move_later_prefix = 0;
 
 		udev_list_cleanup_entries(udev_enumerate->udev, &udev_enumerate->devices_list);
 		qsort(udev_enumerate->devices, udev_enumerate->devices_cur, sizeof(struct syspath), syspath_cmp);
@@ -559,7 +559,7 @@ static int scan_dir_and_add_devices(struct udev_enumerate *udev_enumerate,
 	if (subdir1 != NULL)
 		l = util_strpcpyl(&s, l, "/", subdir1, NULL);
 	if (subdir2 != NULL)
-		l = util_strpcpyl(&s, l, "/", subdir2, NULL);
+		util_strpcpyl(&s, l, "/", subdir2, NULL);
 	dir = opendir(path);
 	if (dir == NULL)
 		return -1;
@@ -574,6 +574,8 @@ static int scan_dir_and_add_devices(struct udev_enumerate *udev_enumerate,
 			continue;
 
 		util_strscpyl(syspath, sizeof(syspath), path, "/", dent->d_name, NULL);
+		if (!match_property(udev_enumerate, syspath))
+			continue;
 		if (lstat(syspath, &statbuf) != 0)
 			continue;
 		if (S_ISREG(statbuf.st_mode))
@@ -586,8 +588,6 @@ static int scan_dir_and_add_devices(struct udev_enumerate *udev_enumerate,
 			continue;
 		if (!match_sysattr(udev_enumerate, syspath))
 			continue;
-		if (!match_property(udev_enumerate, syspath))
-			continue;
 		syspath_add(udev_enumerate, syspath);
 	}
 	closedir(dir);
@@ -685,18 +685,6 @@ int udev_enumerate_scan_devices(struct udev_enumerate *udev_enumerate)
 		scan_dir(udev_enumerate, "bus", "devices", NULL);
 		dbg(udev, "searching '/class/*' dir\n");
 		scan_dir(udev_enumerate, "class", NULL, NULL);
-		/* if block isn't a class, scan /block/ */
-		util_strscpyl(base, sizeof(base), udev_get_sys_path(udev), "/class/block", NULL);
-		if (stat(base, &statbuf) != 0) {
-			if (match_subsystem(udev_enumerate, "block")) {
-				dbg(udev, "searching '/block/*' dir\n");
-				/* scan disks */
-				scan_dir_and_add_devices(udev_enumerate, "block", NULL, NULL);
-				/* scan partitions */
-				dbg(udev, "searching '/block/*/*' dir\n");
-				scan_dir(udev_enumerate, "block", NULL, "block");
-			}
-		}
 	}
 	return 0;
 }