X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev_rules.c;h=117ffdc2d07b4a24b80052b7691e216d059400a7;hb=a0e5382d66567cc91c1a1f571e9fb5288106e876;hp=aa66c7ad30a858bcdfc3b739cb7ddda2af3e5f09;hpb=be4bedd16b934c8663f8c231f07f23091cde8261;p=elogind.git

diff --git a/udev_rules.c b/udev_rules.c
index aa66c7ad3..117ffdc2d 100644
--- a/udev_rules.c
+++ b/udev_rules.c
@@ -174,21 +174,26 @@ static int get_key(char **line, char **key, char **value)
 		linepos++;
 
 	/* get the value*/
-	if (linepos[0] == '\0')
-		return -1;
-
 	if (linepos[0] == '"') {
 		linepos++;
 		temp = strchr(linepos, '"');
-		if (!temp)
+		if (!temp) {
+			dbg("missing closing quote");
 			return -1;
+		}
+		dbg("value is quoted");
 		temp[0] = '\0';
 	} else if (linepos[0] == '\'') {
 		linepos++;
 		temp = strchr(linepos, '\'');
-		if (!temp)
+		if (!temp) {
+			dbg("missing closing quote");
 			return -1;
+		}
+		dbg("value is quoted");
 		temp[0] = '\0';
+	} else if (linepos[0] == '\0') {
+		dbg("value is empty");
 	} else {
 		temp = linepos;
 		while (temp[0] && !isspace(temp[0]))
@@ -200,7 +205,7 @@ static int get_key(char **line, char **key, char **value)
 	return 0;
 }
 
-static int import_keys_into_env(const char *buf, size_t bufsize)
+static int import_keys_into_env(struct udevice *udev, const char *buf, size_t bufsize)
 {
 	char line[LINE_SIZE];
 	const char *bufline;
@@ -211,7 +216,7 @@ static int import_keys_into_env(const char *buf, size_t bufsize)
 	size_t count;
 	int lineno;
 
-	/* loop through the whole file */
+	/* loop through the whole buffer */
 	lineno = 0;
 	cur = 0;
 	while (cur < bufsize) {
@@ -241,15 +246,16 @@ static int import_keys_into_env(const char *buf, size_t bufsize)
 
 		linepos = line;
 		if (get_key(&linepos, &variable, &value) == 0) {
-			dbg("import %s=%s", variable, value);
-			setenv(variable, value, 0);
+			dbg("import '%s=%s'", variable, value);
+			name_list_key_add(&udev->env_list, variable, value);
+			setenv(variable, value, 1);
 		}
 	}
 
 	return 0;
 }
 
-static int import_file_into_env(const char *filename)
+static int import_file_into_env(struct udevice *udev, const char *filename)
 {
 	char *buf;
 	size_t bufsize;
@@ -258,17 +264,24 @@ static int import_file_into_env(const char *filename)
 		err("can't open '%s'", filename);
 		return -1;
 	}
-	import_keys_into_env(buf, bufsize);
+	import_keys_into_env(udev, buf, bufsize);
 	file_unmap(buf, bufsize);
 
 	return 0;
 }
 
-/** Finds the lowest positive N such that <name>N isn't present in 
- *  $(udevroot) either as a file or a symlink.
- *
- *  @param  name                Name to check for
- *  @return                     0 if <name> didn't exist and N otherwise.
+static int import_program_into_env(struct udevice *udev, const char *program)
+{
+	char result[1024];
+	size_t reslen;
+
+	if (execute_program(program, udev->subsystem, result, sizeof(result), &reslen) != 0)
+		return -1;
+	return import_keys_into_env(udev, result, reslen);
+}
+
+/* finds the lowest positive N such that <name>N isn't present in the udevdb
+ * if <name> doesn't exist, 0 is returned, N otherwise
  */
 static int find_free_number(struct udevice *udev, const char *name)
 {
@@ -586,70 +599,44 @@ found:
 	}
 }
 
+static int match_key(const char *key, const char *key_val, enum key_operation key_op, const char *val)
+{
+	int match;
+
+	if (key_op == KEY_OP_UNSET)
+		return 0;
+
+	dbg("check for %s '%s' <-> '%s'", key, key_val, val);
+	match = (strcmp_pattern(key_val, val) == 0);
+	if (match && (key_op != KEY_OP_NOMATCH)) {
+		dbg("%s key is matching (matching value)", key);
+		return 0;
+	}
+	if (!match && (key_op == KEY_OP_NOMATCH)) {
+		dbg("%s key is matching, (non matching value)", key);
+		return 0;
+	}
+
+	dbg("%s key is not matching", key);
+	return -1;
+}
+
 static int match_rule(struct udevice *udev, struct udev_rule *rule,
 		      struct sysfs_class_device *class_dev, struct sysfs_device *sysfs_device)
 {
 	struct sysfs_device *parent_device = sysfs_device;
 
-	if (rule->action_operation != KEY_OP_UNSET) {
-		dbg("check for " KEY_ACTION " rule->action='%s' udev->action='%s'",
-		    rule->action, udev->action);
-		if (strcmp_pattern(rule->action, udev->action) != 0) {
-			dbg(KEY_ACTION " is not matching");
-			if (rule->action_operation != KEY_OP_NOMATCH)
-				goto exit;
-		} else {
-			dbg(KEY_ACTION " matches");
-			if (rule->action_operation == KEY_OP_NOMATCH)
-				goto exit;
-		}
-		dbg(KEY_ACTION " key is true");
-	}
+	if (match_key(KEY_ACTION, rule->action, rule->action_operation, udev->action))
+		goto exit;
 
-	if (rule->kernel_operation != KEY_OP_UNSET) {
-		dbg("check for " KEY_KERNEL " rule->kernel='%s' udev_kernel_name='%s'",
-		    rule->kernel, udev->kernel_name);
-		if (strcmp_pattern(rule->kernel, udev->kernel_name) != 0) {
-			dbg(KEY_KERNEL " is not matching");
-			if (rule->kernel_operation != KEY_OP_NOMATCH)
-				goto exit;
-		} else {
-			dbg(KEY_KERNEL " matches");
-			if (rule->kernel_operation == KEY_OP_NOMATCH)
-				goto exit;
-		}
-		dbg(KEY_KERNEL " key is true");
-	}
+	if (match_key(KEY_KERNEL, rule->kernel_name, rule->kernel_operation, udev->kernel_name))
+		goto exit;
 
-	if (rule->subsystem_operation != KEY_OP_UNSET) {
-		dbg("check for " KEY_SUBSYSTEM " rule->subsystem='%s' udev->subsystem='%s'",
-		    rule->subsystem, udev->subsystem);
-		if (strcmp_pattern(rule->subsystem, udev->subsystem) != 0) {
-			dbg(KEY_SUBSYSTEM " is not matching");
-			if (rule->subsystem_operation != KEY_OP_NOMATCH)
-				goto exit;
-		} else {
-			dbg(KEY_SUBSYSTEM " matches");
-			if (rule->subsystem_operation == KEY_OP_NOMATCH)
-				goto exit;
-		}
-		dbg(KEY_SUBSYSTEM " key is true");
-	}
+	if (match_key(KEY_SUBSYSTEM, rule->subsystem, rule->subsystem_operation, udev->subsystem))
+		goto exit;
 
-	if (rule->devpath_operation != KEY_OP_UNSET) {
-		dbg("check for " KEY_DEVPATH " rule->devpath='%s' udev->devpath='%s'",
-		    rule->devpath, udev->devpath);
-		if (strcmp_pattern(rule->devpath, udev->devpath) != 0) {
-			dbg(KEY_DEVPATH " is not matching");
-			if (rule->devpath_operation != KEY_OP_NOMATCH)
-				goto exit;
-		} else {
-			dbg(KEY_DEVPATH " matches");
-			if (rule->devpath_operation == KEY_OP_NOMATCH)
-				goto exit;
-		}
-		dbg(KEY_DEVPATH " key is true");
-	}
+	if (match_key(KEY_DEVPATH, rule->devpath, rule->devpath_operation, udev->devpath))
+		goto exit;
 
 	if (rule->modalias_operation != KEY_OP_UNSET) {
 		char value[NAME_SIZE];
@@ -658,18 +645,8 @@ static int match_rule(struct udevice *udev, struct udev_rule *rule,
 			dbg(KEY_MODALIAS " value not found");
 			goto exit;
 		}
-		dbg("check for " KEY_MODALIAS " rule->modalias='%s' modalias='%s'",
-		    rule->modalias, value);
-		if (strcmp_pattern(rule->modalias, value) != 0) {
-			dbg(KEY_MODALIAS " is not matching");
-			if (rule->modalias_operation != KEY_OP_NOMATCH)
-				goto exit;
-		} else {
-			dbg(KEY_MODALIAS " matches");
-			if (rule->modalias_operation == KEY_OP_NOMATCH)
-				goto exit;
-		}
-		dbg(KEY_MODALIAS " key is true");
+		if (match_key(KEY_MODALIAS, rule->modalias, rule->modalias_operation, value))
+			goto exit;
 	}
 
 	if (rule->env_pair_count) {
@@ -686,17 +663,11 @@ static int match_rule(struct udevice *udev, struct udev_rule *rule,
 				dbg(KEY_ENV "{'%s'} is not found", pair->name);
 				goto exit;
 			}
-			if (strcmp_pattern(pair->value, value) != 0) {
-				dbg(KEY_ENV "{'%s'} is not matching", pair->name);
-				if (pair->operation != KEY_OP_NOMATCH)
-					goto exit;
-			} else {
-				dbg(KEY_ENV "{'%s'} matches", pair->name);
-				if (pair->operation == KEY_OP_NOMATCH)
-					goto exit;
-			}
+			dbg("check %i " KEY_ENV " keys", rule->env_pair_count);
+			if (match_key(pair->name, pair->value, pair->operation, value))
+				goto exit;
 		}
-		dbg(KEY_ENV " key is true");
+		dbg("all %i " KEY_ENV " keys matched", rule->env_pair_count);
 	}
 
 	/* walk up the chain of physical devices and find a match */
@@ -707,18 +678,8 @@ static int match_rule(struct udevice *udev, struct udev_rule *rule,
 				dbg("device has no sysfs_device");
 				goto exit;
 			}
-			dbg("check for " KEY_DRIVER " rule->driver='%s' sysfs_device->driver_name='%s'",
-			    rule->driver, parent_device->driver_name);
-			if (strcmp_pattern(rule->driver, parent_device->driver_name) != 0) {
-				dbg(KEY_DRIVER " is not matching");
-				if (rule->driver_operation != KEY_OP_NOMATCH)
-					goto try_parent;
-			} else {
-				dbg(KEY_DRIVER " matches");
-				if (rule->driver_operation == KEY_OP_NOMATCH)
-					goto try_parent;
-			}
-			dbg(KEY_DRIVER " key is true");
+			if (match_key(KEY_BUS, rule->driver, rule->driver_operation, parent_device->driver_name))
+				goto try_parent;
 		}
 
 		/* check for matching bus value */
@@ -727,18 +688,8 @@ static int match_rule(struct udevice *udev, struct udev_rule *rule,
 				dbg("device has no sysfs_device");
 				goto exit;
 			}
-			dbg("check for " KEY_BUS " rule->bus='%s' sysfs_device->bus='%s'",
-			    rule->bus, parent_device->bus);
-			if (strcmp_pattern(rule->bus, parent_device->bus) != 0) {
-				dbg(KEY_BUS " is not matching");
-				if (rule->bus_operation != KEY_OP_NOMATCH)
-					goto try_parent;
-			} else {
-				dbg(KEY_BUS " matches");
-				if (rule->bus_operation == KEY_OP_NOMATCH)
-					goto try_parent;
-			}
-			dbg(KEY_BUS " key is true");
+			if (match_key(KEY_BUS, rule->bus, rule->bus_operation, parent_device->bus))
+				goto try_parent;
 		}
 
 		/* check for matching bus id */
@@ -747,17 +698,8 @@ static int match_rule(struct udevice *udev, struct udev_rule *rule,
 				dbg("device has no sysfs_device");
 				goto exit;
 			}
-			dbg("check " KEY_ID);
-			if (strcmp_pattern(rule->id, parent_device->bus_id) != 0) {
-				dbg(KEY_ID " is not matching");
-				if (rule->id_operation != KEY_OP_NOMATCH)
-					goto try_parent;
-			} else {
-				dbg(KEY_ID " matches");
-				if (rule->id_operation == KEY_OP_NOMATCH)
-					goto try_parent;
-			}
-			dbg(KEY_ID " key is true");
+			if (match_key(KEY_ID, rule->id, rule->id_operation, parent_device->bus_id))
+				goto try_parent;
 		}
 
 		/* check for matching sysfs pairs */
@@ -780,21 +722,14 @@ static int match_rule(struct udevice *udev, struct udev_rule *rule,
 					len = strlen(value);
 					while (len > 0 && isspace(value[len-1]))
 						value[--len] = '\0';
-					dbg("removed %i trailing whitespace chars from '%s'", strlen(value)-len, value);
+					dbg("removed %zi trailing whitespace chars from '%s'", strlen(value)-len, value);
 				}
 
-				dbg("compare attribute '%s' value '%s' with '%s'", pair->name, value, pair->value);
-				if (strcmp_pattern(pair->value, value) != 0) {
-					dbg(KEY_SYSFS "{'%s'} is not matching", pair->name);
-					if (pair->operation != KEY_OP_NOMATCH)
-						goto try_parent;
-				} else {
-					dbg(KEY_SYSFS "{'%s'} matches", pair->name);
-					if (pair->operation == KEY_OP_NOMATCH)
-						goto try_parent;
-				}
+				dbg("check %i " KEY_SYSFS " keys", rule->sysfs_pair_count);
+				if (match_key(pair->name, pair->value, pair->operation, value))
+					goto try_parent;
 			}
-			dbg(KEY_SYSFS " keys are true");
+			dbg("all %i " KEY_SYSFS " keys matched", rule->sysfs_pair_count);
 		}
 
 		/* found matching physical device  */
@@ -811,16 +746,24 @@ try_parent:
 	/* import variables from file into environment */
 	if (rule->import_operation != KEY_OP_UNSET) {
 		char import[PATH_SIZE];
+		int rc = -1;
 
 		strlcpy(import, rule->import, sizeof(import));
 		apply_format(udev, import, sizeof(import), class_dev, sysfs_device);
-		dbg("check for " KEY_IMPORT " import='%s", import);
-		if (import_file_into_env(import) != 0) {
+		dbg("check for " KEY_IMPORT " import='%s'", import);
+		if (rule->import_exec) {
+			dbg("run executable file import='%s'", import);
+			rc = import_program_into_env(udev, import);
+		} else {
+			dbg("import file import='%s'", import);
+			rc = import_file_into_env(udev, import);
+		}
+		if (rc) {
 			dbg(KEY_IMPORT " failed");
 			if (rule->import_operation != KEY_OP_NOMATCH)
 				goto exit;
 		} else
-			dbg(KEY_IMPORT " file '%s' imported", rule->import);
+			dbg(KEY_IMPORT " '%s' imported", rule->import);
 		dbg(KEY_IMPORT " key is true");
 	}
 
@@ -850,20 +793,8 @@ try_parent:
 	}
 
 	/* check for matching result of external program */
-	if (rule->result_operation != KEY_OP_UNSET) {
-		dbg("check for " KEY_RESULT " rule->result='%s', udev->program_result='%s'",
-		   rule->result, udev->program_result);
-		if (strcmp_pattern(rule->result, udev->program_result) != 0) {
-			dbg(KEY_RESULT " is not matching");
-			if (rule->result_operation != KEY_OP_NOMATCH)
-				goto exit;
-		} else {
-			dbg(KEY_RESULT " matches");
-			if (rule->result_operation == KEY_OP_NOMATCH)
-				goto exit;
-		}
-		dbg(KEY_RESULT " key is true");
-	}
+	if (match_key(KEY_RESULT, rule->result, rule->result_operation, udev->program_result))
+		goto exit;
 
 	/* rule matches */
 	return 0;
@@ -1068,9 +999,6 @@ int udev_rules_get_run(struct udevice *udev, struct sysfs_device *sysfs_device)
 			break;
 
 		dbg("process rule");
-		if (rule->run_operation == KEY_OP_UNSET)
-			continue;
-
 		if (rule->name_operation != KEY_OP_UNSET || rule->symlink_operation != KEY_OP_UNSET ||
 		    rule->mode != 0000 || rule->owner[0] != '\0' || rule->group[0] != '\0') {
 			dbg("skip rule that names a device");