X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev%2Fudev-rules.c;h=bc224040d215bce342aefb8a9840efe9a17c276e;hb=335e316a716e72a7aa8e56f266b6c8d7ad4f70a6;hp=a174d5db40ef6dfdb88f9e8eb6cc796898277d41;hpb=fc206fbe3e326f5acfc64243f9e04eecad121e27;p=elogind.git

diff --git a/udev/udev-rules.c b/udev/udev-rules.c
index a174d5db4..bc224040d 100644
--- a/udev/udev-rules.c
+++ b/udev/udev-rules.c
@@ -27,6 +27,7 @@
 #include <errno.h>
 #include <dirent.h>
 #include <fnmatch.h>
+#include <time.h>
 
 #include "udev.h"
 
@@ -270,7 +271,7 @@ static const char *token_str(enum token_type type)
 		[TK_M_PROGRAM] =		"M PROGRAM",
 		[TK_M_IMPORT_FILE] =		"M IMPORT_FILE",
 		[TK_M_IMPORT_PROG] =		"M IMPORT_PROG",
-		[TK_M_IMPORT_PARENT] =		"M MPORT_PARENT",
+		[TK_M_IMPORT_PARENT] =		"M IMPORT_PARENT",
 		[TK_M_RESULT] =			"M RESULT",
 		[TK_M_MAX] =			"M MAX",
 
@@ -748,7 +749,7 @@ static int import_program_into_properties(struct udev_device *dev, const char *p
 	char *line;
 
 	envp = udev_device_get_properties_envp(dev);
-	if (util_run_program(udev, program, envp, result, sizeof(result), &reslen) != 0)
+	if (util_run_program(udev, program, envp, result, sizeof(result), &reslen, NULL) != 0)
 		return -1;
 
 	line = result;
@@ -814,6 +815,8 @@ static int wait_for_file(struct udev_device *dev, const char *file, int timeout)
 
 	dbg(udev, "will wait %i sec for '%s'\n", timeout, file);
 	while (--loop) {
+		const struct timespec duration = { 0, 1000 * 1000 * 1000 / WAIT_LOOP_PER_SECOND };
+
 		/* lookup file */
 		if (stat(file, &stats) == 0) {
 			info(udev, "file '%s' appeared after %i loops\n", file, (timeout * WAIT_LOOP_PER_SECOND) - loop-1);
@@ -825,7 +828,7 @@ static int wait_for_file(struct udev_device *dev, const char *file, int timeout)
 			return -2;
 		}
 		info(udev, "wait for '%s' for %i mseconds\n", file, 1000 / WAIT_LOOP_PER_SECOND);
-		usleep(1000 * 1000 / WAIT_LOOP_PER_SECOND);
+		nanosleep(&duration, NULL);
 	}
 	info(udev, "waiting for '%s' failed\n", file);
 	return -1;
@@ -875,7 +878,7 @@ static int get_key(struct udev *udev, char **line, char **key, enum operation_ty
 	char *temp;
 
 	linepos = *line;
-	if (linepos == NULL && linepos[0] == '\0')
+	if (linepos == NULL || linepos[0] == '\0')
 		return -1;
 
 	/* skip whitespace */
@@ -1379,7 +1382,7 @@ static int add_rule(struct udev_rules *rules, char *line,
 			int flag = 0;
 
 			attr = get_key_attribute(rules->udev, key + sizeof("RUN")-1);
-			if (attr != NULL && strstr(attr, "ignore_error"))
+			if (attr != NULL && strstr(attr, "fail_event_on_error"))
 				flag = 1;
 			rule_add_key(&rule_tmp, TK_A_RUN, op, value, &flag);
 			continue;
@@ -1406,6 +1409,9 @@ static int add_rule(struct udev_rules *rules, char *line,
 			} else {
 				if (value[0] == '\0')
 					info(rules->udev, "name empty, node creation suppressed\n");
+				else if (strcmp(value, "%k") == 0)
+					err(rules->udev, "NAME=\"%%k\" is superfluous and breaks "
+					    "kernel supplied names, please remove it from %s:%u\n", filename, lineno);
 				rule_add_key(&rule_tmp, TK_A_NAME, op, value, NULL);
 				attr = get_key_attribute(rules->udev, key + sizeof("NAME")-1);
 				if (attr != NULL) {
@@ -1508,7 +1514,7 @@ static int add_rule(struct udev_rules *rules, char *line,
 				int tout = atoi(&pos[strlen("event_timeout=")]);
 
 				rule_add_key(&rule_tmp, TK_A_EVENT_TIMEOUT, 0, NULL, &tout);
-				dbg(rules->udev, "event timout=%i\n", tout);
+				dbg(rules->udev, "event timeout=%i\n", tout);
 			}
 			pos = strstr(value, "string_escape=");
 			if (pos != NULL) {
@@ -1575,7 +1581,7 @@ static int parse_file(struct udev_rules *rules, const char *filename, unsigned s
 
 	first_token = rules->token_cur;
 
-	while(fgets(line, sizeof(line), f) != NULL) {
+	while (fgets(line, sizeof(line), f) != NULL) {
 		char *key;
 		size_t len;
 
@@ -1597,6 +1603,8 @@ static int parse_file(struct udev_rules *rules, const char *filename, unsigned s
 		while (line[len-2] == '\\') {
 			if (fgets(&line[len-2], (sizeof(line)-len)+2, f) == NULL)
 				break;
+			if (strlen(&line[len-2]) < 2)
+				break;
 			line_nr++;
 			len = strlen(line);
 		}
@@ -1795,7 +1803,7 @@ struct udev_rules *udev_rules_new(struct udev *udev, int resolve_names)
 		if (stat(filename, &statbuf) == 0 && statbuf.st_size > 0)
 			parse_file(rules, filename, filename_off);
 		else
-			info(udev, "can not read '%s'\n", filename);
+			err(udev, "can not read '%s'\n", filename);
 		udev_list_entry_delete(file_loop);
 	}
 
@@ -2198,7 +2206,7 @@ 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) != 0) {
+				if (util_run_program(event->udev, program, envp, result, sizeof(result), NULL, NULL) != 0) {
 					if (cur->key.op != OP_NOMATCH)
 						goto nomatch;
 				} else {