ericonr
/
util-linux
mirror of https://github.com/ericonr/util-linux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

lib/sysfs: improve sysfs_is_partition_dirent() 

... to work with absolute disk device path too.

Signed-off-by: Karel Zak <kzak@redhat.com>
This commit is contained in:
Karel Zak 2012-03-29 12:42:24 +02:00
parent 25c30aa8b9
commit 093b20ba21
1 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lib/sysfs.c
View File

@ -2,6 +2,8 @@
* Copyright (C) 2011 Karel Zak <kzak@redhat.com>
*/
#include <ctype.h>
#include "c.h"
#include "at.h"
#include "pathnames.h"
@ -285,8 +287,26 @@ int sysfs_is_partition_dirent(DIR *dir, struct dirent *d, const char *parent_nam
d->d_type != DT_LNK)
return 0;
#endif
if (parent_name && strncmp(parent_name, d->d_name, strlen(parent_name)))
return 0;
if (parent_name) {
const char *p = parent_name;
size_t len;
/* /dev/sda --> "sda" */
if (*parent_name == '/') {
p = strrchr(parent_name, '/');
if (!p)
return 0;
p++;
}
len = strlen(p);
if (strlen(d->d_name) <= len)
return 0;
/* partitions subdir name is "<parent>[:digit:]" */
return strncmp(p, d->d_name, len) == 0
&& isdigit(*(d->d_name + len));
}
/* Cannot use /partition file, not supported on old sysfs */
snprintf(path, sizeof(path), "%s/start", d->d_name);