X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udevtrigger.c;h=bf5ec25aca66d124794824cb626ed4b7aa79ca11;hp=9345a06ab7b0c530cb37cca26d4db368d4f928cc;hb=8091f6a90ccca1dd86271aec3441b01c2af4fbd5;hpb=04cc3a81d02af4d131b9c92defd7538f22089774 diff --git a/udevtrigger.c b/udevtrigger.c index 9345a06ab..bf5ec25ac 100644 --- a/udevtrigger.c +++ b/udevtrigger.c @@ -1,6 +1,4 @@ /* - * udevtrigger.c - * * Copyright (C) 2004-2006 Kay Sievers * Copyright (C) 2006 Hannes Reinecke * @@ -15,7 +13,7 @@ * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., - * 675 Mass Ave, Cambridge, MA 02139, USA. + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * */ @@ -24,19 +22,18 @@ #include #include #include +#include #include #include #include #include +#include #include #include #include "udev.h" #include "udevd.h" -static int verbose; -static int dry_run; - #ifdef USE_LOG void log_message(int priority, const char *format, ...) { @@ -51,6 +48,9 @@ void log_message(int priority, const char *format, ...) } #endif +static int verbose; +static int dry_run; + /* list of devices that we should run last due to any one of a number of reasons */ static char *last_list[] = { "/class/block/md", @@ -71,6 +71,11 @@ LIST_HEAD(device_first_list); LIST_HEAD(device_default_list); LIST_HEAD(device_last_list); +LIST_HEAD(filter_subsystem_match_list); +LIST_HEAD(filter_subsystem_nomatch_list); +LIST_HEAD(filter_attr_match_list); +LIST_HEAD(filter_attr_nomatch_list); + static int device_list_insert(const char *path) { struct list_head *device_list = &device_default_list; @@ -166,6 +171,93 @@ static int is_device(const char *path) return 1; } +static int subsystem_filtered(const char *subsystem) +{ + struct name_entry *loop_name; + + /* skip devices matching the listed subsystems */ + list_for_each_entry(loop_name, &filter_subsystem_nomatch_list, node) + if (fnmatch(loop_name->name, subsystem, 0) == 0) + return 1; + + /* skip devices not matching the listed subsystems */ + if (!list_empty(&filter_subsystem_match_list)) { + list_for_each_entry(loop_name, &filter_subsystem_match_list, node) + if (fnmatch(loop_name->name, subsystem, 0) == 0) + return 0; + return 1; + } + + return 0; +} + +static int attr_match(const char *path, const char *attr_value) +{ + char attr[NAME_SIZE]; + char file[PATH_SIZE]; + char *match_value; + + strlcpy(attr, attr_value, sizeof(attr)); + + /* separate attr and match value */ + match_value = strchr(attr, '='); + if (match_value != NULL) { + match_value[0] = '\0'; + match_value = &match_value[1]; + } + + strlcpy(file, path, sizeof(file)); + strlcat(file, "/", sizeof(file)); + strlcat(file, attr, sizeof(file)); + + if (match_value != NULL) { + /* match file content */ + char value[NAME_SIZE]; + int fd; + ssize_t size; + + fd = open(file, O_RDONLY); + if (fd < 0) + return 0; + size = read(fd, value, sizeof(value)); + close(fd); + if (size < 0) + return 0; + value[size] = '\0'; + remove_trailing_chars(value, '\n'); + + /* match if attribute value matches */ + if (fnmatch(match_value, value, 0) == 0) + return 1; + } else { + /* match if attribute exists */ + struct stat statbuf; + + if (stat(file, &statbuf) == 0) + return 1; + } + return 0; +} + +static int attr_filtered(const char *path) +{ + struct name_entry *loop_name; + + /* skip devices matching the listed sysfs attributes */ + list_for_each_entry(loop_name, &filter_attr_nomatch_list, node) + if (attr_match(path, loop_name->name)) + return 1; + + /* skip devices not matching the listed sysfs attributes */ + if (!list_empty(&filter_attr_match_list)) { + list_for_each_entry(loop_name, &filter_attr_match_list, node) + if (attr_match(path, loop_name->name)) + return 0; + return 1; + } + return 0; +} + static void scan_bus(void) { char base[PATH_SIZE]; @@ -185,6 +277,9 @@ static void scan_bus(void) if (dent->d_name[0] == '.') continue; + if (subsystem_filtered(dent->d_name)) + continue; + strlcpy(dirname, base, sizeof(dirname)); strlcat(dirname, "/", sizeof(dirname)); strlcat(dirname, dent->d_name, sizeof(dirname)); @@ -202,7 +297,8 @@ static void scan_bus(void) strlcpy(dirname2, dirname, sizeof(dirname2)); strlcat(dirname2, "/", sizeof(dirname2)); strlcat(dirname2, dent2->d_name, sizeof(dirname2)); - + if (attr_filtered(dirname2)) + continue; if (is_device(dirname2)) device_list_insert(dirname2); } @@ -226,6 +322,9 @@ static void scan_block(void) if (stat(base, &statbuf) == 0) return; + if (subsystem_filtered("block")) + return; + strlcpy(base, sysfs_path, sizeof(base)); strlcat(base, "/block", sizeof(base)); @@ -242,6 +341,8 @@ static void scan_block(void) strlcpy(dirname, base, sizeof(dirname)); strlcat(dirname, "/", sizeof(dirname)); strlcat(dirname, dent->d_name, sizeof(dirname)); + if (attr_filtered(dirname)) + continue; if (is_device(dirname)) device_list_insert(dirname); else @@ -262,6 +363,8 @@ static void scan_block(void) strlcpy(dirname2, dirname, sizeof(dirname2)); strlcat(dirname2, "/", sizeof(dirname2)); strlcat(dirname2, dent2->d_name, sizeof(dirname2)); + if (attr_filtered(dirname2)) + continue; if (is_device(dirname2)) device_list_insert(dirname2); } @@ -291,6 +394,9 @@ static void scan_class(void) if (dent->d_name[0] == '.') continue; + if (subsystem_filtered(dent->d_name)) + continue; + strlcpy(dirname, base, sizeof(dirname)); strlcat(dirname, "/", sizeof(dirname)); strlcat(dirname, dent->d_name, sizeof(dirname)); @@ -308,6 +414,8 @@ static void scan_class(void) strlcpy(dirname2, dirname, sizeof(dirname2)); strlcat(dirname2, "/", sizeof(dirname2)); strlcat(dirname2, dent2->d_name, sizeof(dirname2)); + if (attr_filtered(dirname2)) + continue; if (is_device(dirname2)) device_list_insert(dirname2); } @@ -325,30 +433,30 @@ static void scan_failed(void) struct dirent *dent; strlcpy(base, udev_root, sizeof(base)); - strlcat(base, "/", sizeof(base)); - strlcat(base, EVENT_FAILED_DIR, sizeof(base)); + strlcat(base, "/" EVENT_FAILED_DIR, sizeof(base)); dir = opendir(base); if (dir != NULL) { for (dent = readdir(dir); dent != NULL; dent = readdir(dir)) { - char linkname[PATH_SIZE]; - char target[PATH_SIZE]; - int len; + char device[PATH_SIZE]; + size_t start, end, i; if (dent->d_name[0] == '.') continue; - strlcpy(linkname, base, sizeof(linkname)); - strlcat(linkname, "/", sizeof(linkname)); - strlcat(linkname, dent->d_name, sizeof(linkname)); + strlcpy(device, sysfs_path, sizeof(device)); + start = strlcat(device, "/", sizeof(device)); + end = strlcat(device, dent->d_name, sizeof(device)); + if (end > sizeof(device)) + end = sizeof(device); - len = readlink(linkname, target, sizeof(target)); - if (len <= 0) - continue; - target[len] = '\0'; + /* replace PATH_TO_NAME_CHAR with '/' */ + for (i = start; i < end; i++) + if (device[i] == PATH_TO_NAME_CHAR) + device[i] = '/'; - if (is_device(target)) - device_list_insert(target); + if (is_device(device)) + device_list_insert(device); else continue; } @@ -358,37 +466,87 @@ static void scan_failed(void) int main(int argc, char *argv[], char *envp[]) { - int i; + int failed = 0; + int option; + static const struct option options[] = { + { "verbose", 0, NULL, 'v' }, + { "dry-run", 0, NULL, 'n' }, + { "retry-failed", 0, NULL, 'F' }, + { "help", 0, NULL, 'h' }, + { "subsystem-match", 1, NULL, 's' }, + { "subsystem-nomatch", 1, NULL, 'S' }, + { "attr-match", 1, NULL, 'a' }, + { "attr-nomatch", 1, NULL, 'A' }, + {} + }; logging_init("udevtrigger"); udev_config_init(); dbg("version %s", UDEV_VERSION); sysfs_init(); - for (i = 1 ; i < argc; i++) { - char *arg = argv[i]; + while (1) { + option = getopt_long(argc, argv, "vnFhs:S:a:A:", options, NULL); + if (option == -1) + break; - if (strcmp(arg, "--verbose") == 0 || strcmp(arg, "-v") == 0) { + switch (option) { + case 'v': verbose = 1; - } else if (strcmp(arg, "--dry-run") == 0 || strcmp(arg, "-n") == 0) { + break; + case 'n': dry_run = 1; - } else if (strcmp(arg, "--retry-failed") == 0 || strcmp(arg, "-F") == 0) { - scan_failed(); - exec_lists(); + break; + case 'F': + failed = 1; + break; + case 's': + name_list_add(&filter_subsystem_match_list, optarg, 0); + break; + case 'S': + name_list_add(&filter_subsystem_nomatch_list, optarg, 0); + break; + case 'a': + name_list_add(&filter_attr_match_list, optarg, 0); + break; + case 'A': + name_list_add(&filter_attr_nomatch_list, optarg, 0); + break; + case 'h': + printf("Usage: udevtrigger OPTIONS\n" + " --verbose print the list of devices while running\n" + " --dry-run do not actually trigger the events\n" + " --retry-failed trigger only the events which have been\n" + " marked as failed during a previous run\n" + " --subsystem-match= trigger devices from a matching subystem\n" + " --subsystem-nomatch= exclude devices from a matching subystem\n" + " --attr-match=]> trigger devices with a matching sysfs\n" + " attribute\n" + " --attr-nomatch=]> exclude devices with a matching sysfs\n" + " attribute\n" + " --help print this text\n" + "\n"); goto exit; - } else { - fprintf(stderr, "Usage: udevtrigger [--verbose] [--dry-run] [--retry-failed]\n"); + default: goto exit; } } - /* default action */ - scan_bus(); - scan_class(); - scan_block(); + if (failed) + scan_failed(); + else { + scan_bus(); + scan_class(); + scan_block(); + } exec_lists(); exit: + name_list_cleanup(&filter_subsystem_match_list); + name_list_cleanup(&filter_subsystem_nomatch_list); + name_list_cleanup(&filter_attr_match_list); + name_list_cleanup(&filter_attr_nomatch_list); + sysfs_cleanup(); logging_close(); return 0;