picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

if /sys/subsystem exists, skip class, bus, block scanning

Browse source
This commit is contained in:
Kay Sievers 2006-10-08 16:06:14 +02:00
parent 66ec64e9ad
commit 5ac2854375
1 changed files with 21 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
udevtrigger.c
View file

@ -237,14 +237,15 @@ static int attr_filtered(const char *path)
return 0;
}
static void scan_bus(void)
static void scan_subsystem(const char *subsys)
{
char base[PATH_SIZE];
DIR *dir;
struct dirent *dent;
strlcpy(base, sysfs_path, sizeof(base));
strlcat(base, "/bus", sizeof(base));
strlcat(base, "/", sizeof(base));
strlcat(base, subsys, sizeof(base));
dir = opendir(base);
if (dir != NULL) {
@ -292,13 +293,6 @@ static void scan_block(void)
char base[PATH_SIZE];
DIR *dir;
struct dirent *dent;
struct stat statbuf;
/* skip if "block" is already a "class" */
strlcpy(base, sysfs_path, sizeof(base));
strlcat(base, "/class/block", sizeof(base));
if (stat(base, &statbuf) == 0)
return;
if (subsystem_filtered("block"))
return;
@ -506,9 +500,24 @@ int main(int argc, char *argv[], char *envp[])
if (failed)
scan_failed();
else {
scan_bus();
scan_class();
scan_block();
char base[PATH_SIZE];
struct stat statbuf;
/* if we have /sys/subsystem, forget all the old stuff */
strlcpy(base, sysfs_path, sizeof(base));
strlcat(base, "/subsystem", sizeof(base));
if (stat(base, &statbuf) == 0)
scan_subsystem("subsystem");
else {
scan_subsystem("bus");
scan_class();
/* scan "block" if it isn't a "class" */
strlcpy(base, sysfs_path, sizeof(base));
strlcat(base, "/class/block", sizeof(base));
if (stat(base, &statbuf) != 0)
scan_block();
}
}
exec_list();