You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
52 lines
1.5 KiB
52 lines
1.5 KiB
3 years ago
|
From 9c45c4bf1a1a02ebaf9e24fd7d81d62c676eda7c Mon Sep 17 00:00:00 2001
|
||
|
|
From: Portisch <hugo.portisch@yahoo.de>
|
||
|
|
Date: Mon, 8 Nov 2021 12:31:39 +0100
|
||
|
|
Subject: sysfs: fallback for partitions not including parent name
|
||
|
|
|
||
|
|
Upstream: http://github.com/util-linux/util-linux/commit/9b59641bcec3df9c451eea4c7057751a153a3fcb
|
||
|
|
Addresses: https://bugzilla.redhat.com/show_bug.cgi?id=2021462
|
||
|
|
Signed-off-by: Karel Zak <kzak@redhat.com>
|
||
|
|
---
|
||
|
|
lib/sysfs.c | 12 +++++++-----
|
||
|
|
1 file changed, 7 insertions(+), 5 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/lib/sysfs.c b/lib/sysfs.c
|
||
|
|
index bb7183319..191d870f6 100644
|
||
|
|
--- a/lib/sysfs.c
|
||
|
|
+++ b/lib/sysfs.c
|
||
|
|
@@ -210,9 +210,10 @@ int sysfs_blkdev_is_partition_dirent(DIR *dir, struct dirent *d, const char *par
|
||
|
|
d->d_type != DT_UNKNOWN)
|
||
|
|
return 0;
|
||
|
|
#endif
|
||
|
|
+ size_t len = 0;
|
||
|
|
+
|
||
|
|
if (parent_name) {
|
||
|
|
const char *p = parent_name;
|
||
|
|
- size_t len;
|
||
|
|
|
||
|
|
/* /dev/sda --> "sda" */
|
||
|
|
if (*parent_name == '/') {
|
||
|
|
@@ -223,14 +224,15 @@ int sysfs_blkdev_is_partition_dirent(DIR *dir, struct dirent *d, const char *par
|
||
|
|
}
|
||
|
|
|
||
|
|
len = strlen(p);
|
||
|
|
- if (strlen(d->d_name) <= len)
|
||
|
|
- return 0;
|
||
|
|
+ if ((strlen(d->d_name) <= len) || (strncmp(p, d->d_name, len) != 0))
|
||
|
|
+ len = 0;
|
||
|
|
+ }
|
||
|
|
|
||
|
|
+ if (len > 0) {
|
||
|
|
/* partitions subdir name is
|
||
|
|
* "<parent>[:digit:]" or "<parent>p[:digit:]"
|
||
|
|
*/
|
||
|
|
- return strncmp(p, d->d_name, len) == 0 &&
|
||
|
|
- ((*(d->d_name + len) == 'p' && isdigit(*(d->d_name + len + 1)))
|
||
|
|
+ return ((*(d->d_name + len) == 'p' && isdigit(*(d->d_name + len + 1)))
|
||
|
|
|| isdigit(*(d->d_name + len)));
|
||
|
|
}
|
||
|
|
|
||
|
|
--
|
||
|
|
2.34.1
|
||
|
|
|