timeout handling without alarm()

1 files changed, 20 insertions, 16 deletions

diff --git a/udev/udev-rules.c b/udev/udev-rules.c
index 84513328e7..a786bfb14f 100644
--- a/udev/udev-rules.c
+++ b/udev/udev-rules.c
@@ -139,6 +139,7 @@ enum token_type {
 	TK_M_PARENTS_MAX,
 
 	TK_M_TEST,			/* val, mode_t */
+	TK_M_EVENT_TIMEOUT,		/* int */
 	TK_M_PROGRAM,			/* val */
 	TK_M_IMPORT_FILE,		/* val */
 	TK_M_IMPORT_PROG,		/* val */
@@ -164,7 +165,6 @@ enum token_type {
 	TK_A_TAG,			/* val */
 	TK_A_NAME,			/* val */
 	TK_A_DEVLINK,			/* val */
-	TK_A_EVENT_TIMEOUT,		/* int */
 	TK_A_ATTR,			/* val, attr */
 	TK_A_RUN,			/* val, bool */
 	TK_A_GOTO,			/* size_t */
@@ -274,6 +274,7 @@ static const char *token_str(enum token_type type)
 		[TK_M_PARENTS_MAX] =		"M PARENTS_MAX",
 
 		[TK_M_TEST] =			"M TEST",
+		[TK_M_EVENT_TIMEOUT] =		"M EVENT_TIMEOUT",
 		[TK_M_PROGRAM] =		"M PROGRAM",
 		[TK_M_IMPORT_FILE] =		"M IMPORT_FILE",
 		[TK_M_IMPORT_PROG] =		"M IMPORT_PROG",
@@ -299,7 +300,6 @@ static const char *token_str(enum token_type type)
 		[TK_A_TAG] =			"A ENV",
 		[TK_A_NAME] =			"A NAME",
 		[TK_A_DEVLINK] =		"A DEVLINK",
-		[TK_A_EVENT_TIMEOUT] =		"A EVENT_TIMEOUT",
 		[TK_A_ATTR] =			"A ATTR",
 		[TK_A_RUN] =			"A RUN",
 		[TK_A_GOTO] =			"A GOTO",
@@ -397,7 +397,7 @@ static void dump_token(struct udev_rules *rules, struct token *token)
 	case TK_A_STATIC_NODE:
 		dbg(rules->udev, "%s '%s'\n", token_str(type), value);
 		break;
-	case TK_A_EVENT_TIMEOUT:
+	case TK_M_EVENT_TIMEOUT:
 		dbg(rules->udev, "%s %u\n", token_str(type), token->key.event_timeout);
 		break;
 	case TK_A_GOTO:
@@ -750,17 +750,18 @@ static int import_file_into_properties(struct udev_device *dev, const char *file
 	return 0;
 }
 
-static int import_program_into_properties(struct udev_device *dev, const char *program)
+static int import_program_into_properties(struct udev_event *event, const char *program, const sigset_t *sigmask)
 {
-	struct udev *udev = udev_device_get_udev(dev);
+	struct udev_device *dev = event->dev;
 	char **envp;
 	char result[UTIL_LINE_SIZE];
-	size_t reslen;
 	char *line;
+	int err;
 
 	envp = udev_device_get_properties_envp(dev);
-	if (util_run_program(udev, program, envp, result, sizeof(result), &reslen, NULL) != 0)
-		return -1;
+	err = udev_event_spawn(event, program, envp, sigmask, result, sizeof(result));
+	if (err < 0)
+		return err;
 
 	line = result;
 	while (line != NULL) {
@@ -1070,7 +1071,7 @@ static int rule_add_key(struct rule_tmp *rule_tmp, enum token_type type,
 	case TK_A_STATIC_NODE:
 		token->key.value_off = add_string(rule_tmp->rules, value);
 		break;
-	case TK_A_EVENT_TIMEOUT:
+	case TK_M_EVENT_TIMEOUT:
 		token->key.event_timeout = *(int *)data;
 		break;
 	case TK_RULE:
@@ -1581,7 +1582,7 @@ static int add_rule(struct udev_rules *rules, char *line,
 			if (pos != NULL) {
 				int tout = atoi(&pos[strlen("event_timeout=")]);
 
-				rule_add_key(&rule_tmp, TK_A_EVENT_TIMEOUT, op, NULL, &tout);
+				rule_add_key(&rule_tmp, TK_M_EVENT_TIMEOUT, op, NULL, &tout);
 				dbg(rules->udev, "event timeout=%i\n", tout);
 			}
 
@@ -2081,7 +2082,7 @@ enum escape_type {
 	ESCAPE_REPLACE,
 };
 
-int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event)
+int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event, const sigset_t *sigmask)
 {
 	struct token *cur;
 	struct token *rule;
@@ -2283,6 +2284,10 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event
 					goto nomatch;
 				break;
 			}
+		case TK_M_EVENT_TIMEOUT:
+			info(event->udev, "OPTIONS event_timeout=%u\n", cur->key.event_timeout);
+			event->timeout_usec = cur->key.event_timeout * 1000 * 1000;
+			break;
 		case TK_M_PROGRAM:
 			{
 				char program[UTIL_PATH_SIZE];
@@ -2297,7 +2302,8 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event
 				     program,
 				     &rules->buf[rule->rule.filename_off],
 				     rule->rule.filename_line);
-				if (util_run_program(event->udev, program, envp, result, sizeof(result), NULL, NULL) != 0) {
+
+				if (udev_event_spawn(event, program, envp, sigmask, result, sizeof(result)) < 0) {
 					if (cur->key.op != OP_NOMATCH)
 						goto nomatch;
 				} else {
@@ -2335,7 +2341,8 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event
 				     import,
 				     &rules->buf[rule->rule.filename_off],
 				     rule->rule.filename_line);
-				if (import_program_into_properties(event->dev, import) != 0)
+
+				if (import_program_into_properties(event, import, sigmask) != 0)
 					if (cur->key.op != OP_NOMATCH)
 						goto nomatch;
 				break;
@@ -2617,9 +2624,6 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event
 				}
 			}
 			break;
-		case TK_A_EVENT_TIMEOUT:
-			udev_device_set_event_timeout(event->dev, cur->key.event_timeout);
-			break;
 		case TK_A_ATTR:
 			{
 				const char *key_name = &rules->buf[cur->key.attr_off];