X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev%2Fudev-rules.c;h=4e760a517683563e3a538f1d8c2ffc4dd2117696;hp=3751cbb36d55b311d41a19245cdd92205c15a156;hb=a25d547dd4a67783b939da6f2d592af01336aa6d;hpb=bd284db142c1d3fb6e2a709678c8828c12c52466

diff --git a/udev/udev-rules.c b/udev/udev-rules.c
index 3751cbb36..4e760a517 100644
--- a/udev/udev-rules.c
+++ b/udev/udev-rules.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008 Kay Sievers <kay.sievers@vrfy.org>
+ * Copyright (C) 2008-2009 Kay Sievers <kay.sievers@vrfy.org>
  * Copyright (C) 2008 Alan Jenkins <alan-jenkins@tuffmail.co.uk>
  *
  * This program is free software: you can redistribute it and/or modify
@@ -103,7 +103,6 @@ enum string_glob_type {
 	GL_SPLIT,			/* multi-value A|B */
 	GL_SPLIT_GLOB,			/* multi-value with glob A*|B* */
 	GL_SOMETHING,			/* commonly used "?*" */
-	GL_FORMAT,
 };
 
 /* tokens of a rule are sorted/handled in this order */
@@ -140,7 +139,7 @@ enum token_type {
 	TK_A_IGNORE_DEVICE,
 	TK_A_STRING_ESCAPE_NONE,
 	TK_A_STRING_ESCAPE_REPLACE,
-	TK_A_INOTIFY_WATCH,
+	TK_A_INOTIFY_WATCH,		/* int */
 	TK_A_NUM_FAKE_PART,		/* int */
 	TK_A_DEVLINK_PRIO,		/* int */
 	TK_A_OWNER,			/* val */
@@ -167,7 +166,7 @@ struct token {
 	union {
 		unsigned char type;		/* same as in rule and key */
 		struct {
-			unsigned char type;
+			enum token_type type:8;
 			unsigned char flags;
 			unsigned short token_count;
 			unsigned int label_off;
@@ -175,15 +174,14 @@ struct token {
 			unsigned short filename_line;
 		} rule;
 		struct {
-			unsigned char type;
+			enum token_type type:8;
+			enum operation_type op:8;
+			enum string_glob_type glob:8;
 			unsigned char flags;
-			unsigned char op;
-			unsigned char glob;
 			unsigned int value_off;
 			union {
 				unsigned int attr_off;
 				int ignore_error;
-				int i;
 				unsigned int rule_goto;
 				mode_t  mode;
 				uid_t uid;
@@ -191,6 +189,7 @@ struct token {
 				int num_fake_part;
 				int devlink_prio;
 				int event_timeout;
+				int watch;
 			};
 		} key;
 	};
@@ -230,7 +229,6 @@ static const char *string_glob_str(enum string_glob_type type)
 		[GL_SPLIT] = 		"split",
 		[GL_SPLIT_GLOB] = 	"split-glob",
 		[GL_SOMETHING] = 	"split-glob",
-		[GL_FORMAT] = 		"format",
 	};
 
 	return string_glob_strs[type];
@@ -354,7 +352,6 @@ static void dump_token(struct udev_rules *rules, struct token *token)
 	case TK_A_IGNORE_DEVICE:
 	case TK_A_STRING_ESCAPE_NONE:
 	case TK_A_STRING_ESCAPE_REPLACE:
-	case TK_A_INOTIFY_WATCH:
 	case TK_A_LAST_RULE:
 	case TK_A_IGNORE_REMOVE:
 		dbg(rules->udev, "%s\n", token_str(type));
@@ -363,6 +360,9 @@ static void dump_token(struct udev_rules *rules, struct token *token)
 		dbg(rules->udev, "%s %s '%s'(%s) %#o\n",
 		    token_str(type), operation_str(op), value, string_glob_str(glob), token->key.mode);
 		break;
+	case TK_A_INOTIFY_WATCH:
+		dbg(rules->udev, "%s %u\n", token_str(type), token->key.watch);
+		break;
 	case TK_A_NUM_FAKE_PART:
 		dbg(rules->udev, "%s %u\n", token_str(type), token->key.num_fake_part);
 		break;
@@ -704,8 +704,7 @@ static int import_property_from_string(struct udev_device *dev, char *line)
 
 		info(udev, "updating devpath from '%s' to '%s'\n",
 		     udev_device_get_devpath(dev), val);
-		util_strlcpy(syspath, udev_get_sys_path(udev), sizeof(syspath));
-		util_strlcat(syspath, val, sizeof(syspath));
+		util_strscpyl(syspath, sizeof(syspath), udev_get_sys_path(udev), val, NULL);
 		udev_device_set_syspath(dev, syspath);
 	} else {
 		struct udev_list_entry *entry;
@@ -735,7 +734,7 @@ static int import_program_into_properties(struct udev_device *dev, const char *p
 {
 	struct udev *udev = udev_device_get_udev(dev);
 	char **envp;
-	char result[2048];
+	char result[4096];
 	size_t reslen;
 	char *line;
 
@@ -797,12 +796,9 @@ static int wait_for_file(struct udev_device *dev, const char *file, int timeout)
 	/* a relative path is a device attribute */
 	devicepath[0] = '\0';
 	if (file[0] != '/') {
-		util_strlcpy(devicepath, udev_get_sys_path(udev), sizeof(devicepath));
-		util_strlcat(devicepath, udev_device_get_devpath(dev), sizeof(devicepath));
-
-		util_strlcpy(filepath, devicepath, sizeof(filepath));
-		util_strlcat(filepath, "/", sizeof(filepath));
-		util_strlcat(filepath, file, sizeof(filepath));
+		util_strscpyl(devicepath, sizeof(devicepath),
+			      udev_get_sys_path(udev), udev_device_get_devpath(dev), NULL);
+		util_strscpyl(filepath, sizeof(filepath), devicepath, "/", file, NULL);
 		file = filepath;
 	}
 
@@ -827,17 +823,21 @@ static int wait_for_file(struct udev_device *dev, const char *file, int timeout)
 
 static int attr_subst_subdir(char *attr, size_t len)
 {
-	char *pos;
 	int found = 0;
 
-	pos = strstr(attr, "/*/");
-	if (pos != NULL) {
-		char str[UTIL_PATH_SIZE];
+	if (strstr(attr, "/*/")) {
+		char *pos;
+		char dirname[UTIL_PATH_SIZE];
+		const char *tail;
 		DIR *dir;
 
-		pos[1] = '\0';
-		util_strlcpy(str, &pos[2], sizeof(str));
-		dir = opendir(attr);
+		util_strscpy(dirname, sizeof(dirname), attr);
+		pos = strstr(dirname, "/*/");
+		if (pos == NULL)
+			return -1;
+		pos[0] = '\0';
+		tail = &pos[2];
+		dir = opendir(dirname);
 		if (dir != NULL) {
 			struct dirent *dent;
 
@@ -846,18 +846,14 @@ static int attr_subst_subdir(char *attr, size_t len)
 
 				if (dent->d_name[0] == '.')
 					continue;
-				util_strlcat(attr, dent->d_name, len);
-				util_strlcat(attr, str, len);
+				util_strscpyl(attr, len, dirname, "/", dent->d_name, tail, NULL);
 				if (stat(attr, &stats) == 0) {
 					found = 1;
 					break;
 				}
-				pos[1] = '\0';
 			}
 			closedir(dir);
 		}
-		if (!found)
-			util_strlcat(attr, str, len);
 	}
 
 	return found;
@@ -1023,7 +1019,6 @@ static int rule_add_key(struct rule_tmp *rule_tmp, enum token_type type,
 	case TK_A_IGNORE_DEVICE:
 	case TK_A_STRING_ESCAPE_NONE:
 	case TK_A_STRING_ESCAPE_REPLACE:
-	case TK_A_INOTIFY_WATCH:
 	case TK_A_IGNORE_REMOVE:
 	case TK_A_LAST_RULE:
 		break;
@@ -1031,9 +1026,8 @@ static int rule_add_key(struct rule_tmp *rule_tmp, enum token_type type,
 		token->key.value_off = add_string(rule_tmp->rules, value);
 		token->key.ignore_error = *(int *)data;
 		break;
+	case TK_A_INOTIFY_WATCH:
 	case TK_A_NUM_FAKE_PART:
-		token->key.num_fake_part = *(int *)data;
-		break;
 	case TK_A_DEVLINK_PRIO:
 		token->key.devlink_prio = *(int *)data;
 		break;
@@ -1060,29 +1054,23 @@ static int rule_add_key(struct rule_tmp *rule_tmp, enum token_type type,
 	}
 
 	glob = GL_PLAIN;
-	if (value != NULL) {
-		if (type < TK_M_MAX) {
-			/* check if we need to split or call fnmatch() while matching rules */
-			int has_split;
-			int has_glob;
-
-			has_split = (strchr(value, '|') != NULL);
-			has_glob = (strchr(value, '*') != NULL || strchr(value, '?') != NULL ||
-				    strchr(value, '[') != NULL || strchr(value, ']') != NULL);
-			if (has_split && has_glob) {
-				glob = GL_SPLIT_GLOB;
-			} else if (has_split) {
-				glob = GL_SPLIT;
-			} else if (has_glob) {
-				if (strcmp(value, "?*") == 0)
-					glob = GL_SOMETHING;
-				else
-					glob = GL_GLOB;
-			}
-		} else {
-			/* check if we need to substitute format strings for matching rules */
-			if (strchr(value, '%') != NULL || strchr(value, '$') != NULL)
-				glob = GL_FORMAT;
+	if (value != NULL && type < TK_M_MAX) {
+		/* check if we need to split or call fnmatch() while matching rules */
+		int has_split;
+		int has_glob;
+
+		has_split = (strchr(value, '|') != NULL);
+		has_glob = (strchr(value, '*') != NULL || strchr(value, '?') != NULL ||
+			    strchr(value, '[') != NULL || strchr(value, ']') != NULL);
+		if (has_split && has_glob) {
+			glob = GL_SPLIT_GLOB;
+		} else if (has_split) {
+			glob = GL_SPLIT;
+		} else if (has_glob) {
+			if (strcmp(value, "?*") == 0)
+				glob = GL_SOMETHING;
+			else
+				glob = GL_GLOB;
 		}
 	}
 
@@ -1137,8 +1125,6 @@ static int add_rule(struct udev_rules *rules, char *line,
 {
 	char *linepos;
 	char *attr;
-	int physdev = 0;
-	int waitfor = 0;
 	struct rule_tmp rule_tmp;
 
 	memset(&rule_tmp, 0x00, sizeof(struct rule_tmp));
@@ -1156,7 +1142,7 @@ static int add_rule(struct udev_rules *rules, char *line,
 		if (get_key(rules->udev, &linepos, &key, &op, &value) != 0)
 			break;
 
-		if (strcasecmp(key, "ACTION") == 0) {
+		if (strcmp(key, "ACTION") == 0) {
 			if (op > OP_MATCH_MAX) {
 				err(rules->udev, "invalid ACTION operation\n");
 				goto invalid;
@@ -1165,7 +1151,7 @@ static int add_rule(struct udev_rules *rules, char *line,
 			continue;
 		}
 
-		if (strcasecmp(key, "DEVPATH") == 0) {
+		if (strcmp(key, "DEVPATH") == 0) {
 			if (op > OP_MATCH_MAX) {
 				err(rules->udev, "invalid DEVPATH operation\n");
 				goto invalid;
@@ -1174,7 +1160,7 @@ static int add_rule(struct udev_rules *rules, char *line,
 			continue;
 		}
 
-		if (strcasecmp(key, "KERNEL") == 0) {
+		if (strcmp(key, "KERNEL") == 0) {
 			if (op > OP_MATCH_MAX) {
 				err(rules->udev, "invalid KERNEL operation\n");
 				goto invalid;
@@ -1183,7 +1169,7 @@ static int add_rule(struct udev_rules *rules, char *line,
 			continue;
 		}
 
-		if (strcasecmp(key, "SUBSYSTEM") == 0) {
+		if (strcmp(key, "SUBSYSTEM") == 0) {
 			if (op > OP_MATCH_MAX) {
 				err(rules->udev, "invalid SUBSYSTEM operation\n");
 				goto invalid;
@@ -1201,7 +1187,7 @@ static int add_rule(struct udev_rules *rules, char *line,
 			continue;
 		}
 
-		if (strcasecmp(key, "DRIVER") == 0) {
+		if (strcmp(key, "DRIVER") == 0) {
 			if (op > OP_MATCH_MAX) {
 				err(rules->udev, "invalid DRIVER operation\n");
 				goto invalid;
@@ -1210,7 +1196,7 @@ static int add_rule(struct udev_rules *rules, char *line,
 			continue;
 		}
 
-		if (strncasecmp(key, "ATTR{", sizeof("ATTR{")-1) == 0) {
+		if (strncmp(key, "ATTR{", sizeof("ATTR{")-1) == 0) {
 			attr = get_key_attribute(rules->udev, key + sizeof("ATTR")-1);
 			if (attr == NULL) {
 				err(rules->udev, "error parsing ATTR attribute\n");
@@ -1224,8 +1210,8 @@ static int add_rule(struct udev_rules *rules, char *line,
 			continue;
 		}
 
-		if (strcasecmp(key, "KERNELS") == 0 ||
-		    strcasecmp(key, "ID") == 0) {
+		if (strcmp(key, "KERNELS") == 0 ||
+		    strcmp(key, "ID") == 0) {
 			if (op > OP_MATCH_MAX) {
 				err(rules->udev, "invalid KERNELS operation\n");
 				goto invalid;
@@ -1234,8 +1220,8 @@ static int add_rule(struct udev_rules *rules, char *line,
 			continue;
 		}
 
-		if (strcasecmp(key, "SUBSYSTEMS") == 0 ||
-		    strcasecmp(key, "BUS") == 0) {
+		if (strcmp(key, "SUBSYSTEMS") == 0 ||
+		    strcmp(key, "BUS") == 0) {
 			if (op > OP_MATCH_MAX) {
 				err(rules->udev, "invalid SUBSYSTEMS operation\n");
 				goto invalid;
@@ -1244,7 +1230,7 @@ static int add_rule(struct udev_rules *rules, char *line,
 			continue;
 		}
 
-		if (strcasecmp(key, "DRIVERS") == 0) {
+		if (strcmp(key, "DRIVERS") == 0) {
 			if (op > OP_MATCH_MAX) {
 				err(rules->udev, "invalid DRIVERS operation\n");
 				goto invalid;
@@ -1253,8 +1239,8 @@ static int add_rule(struct udev_rules *rules, char *line,
 			continue;
 		}
 
-		if (strncasecmp(key, "ATTRS{", sizeof("ATTRS{")-1) == 0 ||
-		    strncasecmp(key, "SYSFS{", sizeof("SYSFS{")-1) == 0) {
+		if (strncmp(key, "ATTRS{", sizeof("ATTRS{")-1) == 0 ||
+		    strncmp(key, "SYSFS{", sizeof("SYSFS{")-1) == 0) {
 			if (op > OP_MATCH_MAX) {
 				err(rules->udev, "invalid ATTRS operation\n");
 				goto invalid;
@@ -1274,14 +1260,12 @@ static int add_rule(struct udev_rules *rules, char *line,
 			continue;
 		}
 
-		if (strncasecmp(key, "ENV{", sizeof("ENV{")-1) == 0) {
+		if (strncmp(key, "ENV{", sizeof("ENV{")-1) == 0) {
 			attr = get_key_attribute(rules->udev, key + sizeof("ENV")-1);
 			if (attr == NULL) {
 				err(rules->udev, "error parsing ENV attribute\n");
 				goto invalid;
 			}
-			if (strncmp(attr, "PHYSDEV", 7) == 0)
-				physdev = 1;
 			if (op < OP_MATCH_MAX) {
 				if (rule_add_key(&rule_tmp, TK_M_ENV, op, value, attr) != 0)
 					goto invalid;
@@ -1292,12 +1276,12 @@ static int add_rule(struct udev_rules *rules, char *line,
 			continue;
 		}
 
-		if (strcasecmp(key, "PROGRAM") == 0) {
+		if (strcmp(key, "PROGRAM") == 0) {
 			rule_add_key(&rule_tmp, TK_M_PROGRAM, op, value, NULL);
 			continue;
 		}
 
-		if (strcasecmp(key, "RESULT") == 0) {
+		if (strcmp(key, "RESULT") == 0) {
 			if (op > OP_MATCH_MAX) {
 				err(rules->udev, "invalid RESULT operation\n");
 				goto invalid;
@@ -1306,7 +1290,7 @@ static int add_rule(struct udev_rules *rules, char *line,
 			continue;
 		}
 
-		if (strncasecmp(key, "IMPORT", sizeof("IMPORT")-1) == 0) {
+		if (strncmp(key, "IMPORT", sizeof("IMPORT")-1) == 0) {
 			attr = get_key_attribute(rules->udev, key + sizeof("IMPORT")-1);
 			if (attr != NULL && strstr(attr, "program")) {
 				dbg(rules->udev, "IMPORT will be executed\n");
@@ -1323,22 +1307,16 @@ static int add_rule(struct udev_rules *rules, char *line,
 				char *pos;
 				struct stat statbuf;
 
-				util_strlcpy(file, value, sizeof(file));
+				/* allow programs in /lib/udev called without the path */
+				if (value[0] != '/')
+					util_strscpyl(file, sizeof(file), UDEV_PREFIX "/lib/udev/", value, NULL);
+				else
+					util_strscpy(file, sizeof(file), value);
 				pos = strchr(file, ' ');
 				if (pos)
 					pos[0] = '\0';
-
-				/* allow programs in /lib/udev called without the path */
-				if (strchr(file, '/') == NULL) {
-					util_strlcpy(file, UDEV_PREFIX "/lib/udev/", sizeof(file));
-					util_strlcat(file, value, sizeof(file));
-					pos = strchr(file, ' ');
-					if (pos)
-						pos[0] = '\0';
-				}
-
 				dbg(rules->udev, "IMPORT auto mode for '%s'\n", file);
-				if (!lstat(file, &statbuf) && (statbuf.st_mode & S_IXUSR)) {
+				if (stat(file, &statbuf) == 0 && (statbuf.st_mode & S_IXUSR)) {
 					dbg(rules->udev, "IMPORT will be executed (autotype)\n");
 					rule_add_key(&rule_tmp, TK_M_IMPORT_PROG, op, value, NULL);
 				} else {
@@ -1349,7 +1327,7 @@ static int add_rule(struct udev_rules *rules, char *line,
 			continue;
 		}
 
-		if (strncasecmp(key, "TEST", sizeof("TEST")-1) == 0) {
+		if (strncmp(key, "TEST", sizeof("TEST")-1) == 0) {
 			mode_t mode = 0;
 
 			if (op > OP_MATCH_MAX) {
@@ -1366,7 +1344,7 @@ static int add_rule(struct udev_rules *rules, char *line,
 			continue;
 		}
 
-		if (strncasecmp(key, "RUN", sizeof("RUN")-1) == 0) {
+		if (strncmp(key, "RUN", sizeof("RUN")-1) == 0) {
 			int flag = 0;
 
 			attr = get_key_attribute(rules->udev, key + sizeof("RUN")-1);
@@ -1376,23 +1354,22 @@ static int add_rule(struct udev_rules *rules, char *line,
 			continue;
 		}
 
-		if (strcasecmp(key, "WAIT_FOR") == 0 || strcasecmp(key, "WAIT_FOR_SYSFS") == 0) {
+		if (strcmp(key, "WAIT_FOR") == 0 || strcmp(key, "WAIT_FOR_SYSFS") == 0) {
 			rule_add_key(&rule_tmp, TK_M_WAITFOR, 0, value, NULL);
-			waitfor = 1;
 			continue;
 		}
 
-		if (strcasecmp(key, "LABEL") == 0) {
+		if (strcmp(key, "LABEL") == 0) {
 			rule_tmp.rule.rule.label_off = add_string(rules, value);
 			continue;
 		}
 
-		if (strcasecmp(key, "GOTO") == 0) {
+		if (strcmp(key, "GOTO") == 0) {
 			rule_add_key(&rule_tmp, TK_A_GOTO, 0, value, NULL);
 			continue;
 		}
 
-		if (strncasecmp(key, "NAME", sizeof("NAME")-1) == 0) {
+		if (strncmp(key, "NAME", sizeof("NAME")-1) == 0) {
 			if (op < OP_MATCH_MAX) {
 				rule_add_key(&rule_tmp, TK_M_NAME, op, value, NULL);
 			} else {
@@ -1417,7 +1394,7 @@ static int add_rule(struct udev_rules *rules, char *line,
 			continue;
 		}
 
-		if (strcasecmp(key, "SYMLINK") == 0) {
+		if (strcmp(key, "SYMLINK") == 0) {
 			if (op < OP_MATCH_MAX)
 				rule_add_key(&rule_tmp, TK_M_DEVLINK, op, value, NULL);
 			else
@@ -1426,7 +1403,7 @@ static int add_rule(struct udev_rules *rules, char *line,
 			continue;
 		}
 
-		if (strcasecmp(key, "OWNER") == 0) {
+		if (strcmp(key, "OWNER") == 0) {
 			uid_t uid;
 			char *endptr;
 
@@ -1436,14 +1413,14 @@ static int add_rule(struct udev_rules *rules, char *line,
 			} else if ((rules->resolve_names > 0) && strchr("$%", value[0]) == NULL) {
 				uid = add_uid(rules, value);
 				rule_add_key(&rule_tmp, TK_A_OWNER_ID, op, NULL, &uid);
-			} else if (rules->resolve_names == 0) {
+			} else if (rules->resolve_names >= 0) {
 				rule_add_key(&rule_tmp, TK_A_OWNER, op, value, NULL);
 			}
 			rule_tmp.rule.rule.flags = 1;
 			continue;
 		}
 
-		if (strcasecmp(key, "GROUP") == 0) {
+		if (strcmp(key, "GROUP") == 0) {
 			gid_t gid;
 			char *endptr;
 
@@ -1453,14 +1430,14 @@ static int add_rule(struct udev_rules *rules, char *line,
 			} else if ((rules->resolve_names > 0) && strchr("$%", value[0]) == NULL) {
 				gid = add_gid(rules, value);
 				rule_add_key(&rule_tmp, TK_A_GROUP_ID, op, NULL, &gid);
-			} else if (rules->resolve_names == 0) {
+			} else if (rules->resolve_names >= 0) {
 				rule_add_key(&rule_tmp, TK_A_GROUP, op, value, NULL);
 			}
 			rule_tmp.rule.rule.flags = 1;
 			continue;
 		}
 
-		if (strcasecmp(key, "MODE") == 0) {
+		if (strcmp(key, "MODE") == 0) {
 			mode_t mode;
 			char *endptr;
 
@@ -1473,7 +1450,7 @@ static int add_rule(struct udev_rules *rules, char *line,
 			continue;
 		}
 
-		if (strcasecmp(key, "OPTIONS") == 0) {
+		if (strcmp(key, "OPTIONS") == 0) {
 			const char *pos;
 
 			if (strstr(value, "last_rule") != NULL) {
@@ -1516,20 +1493,26 @@ static int add_rule(struct udev_rules *rules, char *line,
 				rule_add_key(&rule_tmp, TK_A_NUM_FAKE_PART, 0, NULL, &num);
 				dbg(rules->udev, "creation of partition nodes requested\n");
 			}
-			pos = strstr(value, "watch");
+			pos = strstr(value, "nowatch");
 			if (pos != NULL) {
-				rule_add_key(&rule_tmp, TK_A_INOTIFY_WATCH, 0, NULL, NULL);
-				dbg(rules->udev, "inotify watch of device requested\n");
+				const int off = 0;
+
+				rule_add_key(&rule_tmp, TK_A_INOTIFY_WATCH, 0, NULL, &off);
+				dbg(rules->udev, "inotify watch of device disabled\n");
+			} else {
+				pos = strstr(value, "watch");
+				if (pos != NULL) {
+					const int on = 1;
+
+					rule_add_key(&rule_tmp, TK_A_INOTIFY_WATCH, 0, NULL, &on);
+					dbg(rules->udev, "inotify watch of device requested\n");
+				}
 			}
 			continue;
 		}
 		err(rules->udev, "unknown key '%s' in %s:%u\n", key, filename, lineno);
 	}
 
-	if (physdev && !waitfor)
-		err(rules->udev, "PHYSDEV* values are deprecated and not available on recent kernels, "
-		    "please fix it in %s:%u\n", filename, lineno);
-
 	/* add rule token */
 	rule_tmp.rule.rule.token_count = 1 + rule_tmp.token_cur;
 	if (add_token(rules, &rule_tmp.rule) != 0)
@@ -1609,6 +1592,7 @@ static int parse_file(struct udev_rules *rules, const char *filename, unsigned s
 				if (strcmp(label, &rules->buf[rules->tokens[j].rule.label_off]) != 0)
 					continue;
 				rules->tokens[i].key.rule_goto = j;
+				break;
 			}
 			if (rules->tokens[i].key.rule_goto == 0)
 				err(rules->udev, "GOTO '%s' has no matching label in: '%s'\n", label, filename);
@@ -1649,10 +1633,8 @@ static int add_matching_files(struct udev *udev, struct udev_list_node *file_lis
 			if (strcmp(ext, suffix) != 0)
 				continue;
 		}
-		dbg(udev, "put file '%s/%s' into list\n", dirname, dent->d_name);
-
-		snprintf(filename, sizeof(filename), "%s/%s", dirname, dent->d_name);
-		filename[sizeof(filename)-1] = '\0';
+		util_strscpyl(filename, sizeof(filename), dirname, "/", dent->d_name, NULL);
+		dbg(udev, "put file '%s' into list\n", filename);
 		udev_list_entry_add(udev, file_list, filename, NULL, 1, 1);
 	}
 
@@ -1712,8 +1694,7 @@ struct udev_rules *udev_rules_new(struct udev *udev, int resolve_names)
 		add_matching_files(udev, &file_list, SYSCONFDIR "/udev/rules.d", ".rules");
 
 		/* read dynamic/temporary rules */
-		util_strlcpy(filename, udev_get_dev_path(udev), sizeof(filename));
-		util_strlcat(filename, "/.udev/rules.d", sizeof(filename));
+		util_strscpyl(filename, sizeof(filename), udev_get_dev_path(udev), "/.udev/rules.d", NULL);
 		if (stat(filename, &statbuf) != 0) {
 			util_create_path(udev, filename);
 			udev_selinux_setfscreatecon(udev, filename, S_IFDIR|0755);
@@ -1893,7 +1874,7 @@ static int match_key(struct udev_rules *rules, struct token *token, const char *
 		{
 			char value[UTIL_PATH_SIZE];
 
-			util_strlcpy(value, &rules->buf[token->key.value_off], sizeof(value));
+			util_strscpy(value, sizeof(value), &rules->buf[token->key.value_off]);
 			key_value = value;
 			while (key_value != NULL) {
 				pos = strchr(key_value, '|');
@@ -1912,7 +1893,6 @@ static int match_key(struct udev_rules *rules, struct token *token, const char *
 	case GL_SOMETHING:
 		match = (val[0] != '\0');
 		break;
-	case GL_FORMAT:
 	case GL_UNSET:
 		return -1;
 	}
@@ -1940,7 +1920,7 @@ static int match_attr(struct udev_rules *rules, struct udev_device *dev, struct
 	if (key_name[0] == '[') {
 		char attr[UTIL_PATH_SIZE];
 
-		util_strlcpy(attr, key_name, sizeof(attr));
+		util_strscpy(attr, sizeof(attr), key_name);
 		util_resolve_subsys_kernel(event->udev, attr, value, sizeof(value), 1);
 	}
 	if (value[0] == '\0') {
@@ -1949,7 +1929,7 @@ static int match_attr(struct udev_rules *rules, struct udev_device *dev, struct
 		val = udev_device_get_sysattr_value(dev, key_name);
 		if (val == NULL)
 			return -1;
-		util_strlcpy(value, val, sizeof(value));
+		util_strscpy(value, sizeof(value), val);
 	}
 
 	/* strip trailing whitespace of value, if not asked to match for it */
@@ -2060,8 +2040,7 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event
 				char filename[UTIL_PATH_SIZE];
 				int found;
 
-				util_strlcpy(filename, &rules->buf[cur->key.value_off], sizeof(filename));
-				udev_event_apply_format(event, filename, sizeof(filename));
+				udev_event_apply_format(event, &rules->buf[cur->key.value_off], filename, sizeof(filename));
 				found = (wait_for_file(event->dev, filename, 10) == 0);
 				if (!found && (cur->key.op != OP_NOMATCH))
 					goto nomatch;
@@ -2133,18 +2112,16 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event
 				struct stat statbuf;
 				int match;
 
-				util_strlcpy(filename, &rules->buf[cur->key.value_off], sizeof(filename));
-				udev_event_apply_format(event, filename, sizeof(filename));
-				if (util_resolve_subsys_kernel(event->udev, NULL, filename, sizeof(filename), 0) != 0)
+				udev_event_apply_format(event, &rules->buf[cur->key.value_off], filename, sizeof(filename));
+				if (util_resolve_subsys_kernel(event->udev, filename, filename, sizeof(filename), 0) != 0) {
 					if (filename[0] != '/') {
 						char tmp[UTIL_PATH_SIZE];
 
-						util_strlcpy(tmp, udev_device_get_syspath(event->dev), sizeof(tmp));
-						util_strlcat(tmp, "/", sizeof(tmp));
-						util_strlcat(tmp, filename, sizeof(tmp));
-						util_strlcpy(filename, tmp, sizeof(filename));
+						util_strscpy(tmp, sizeof(tmp), filename);
+						util_strscpyl(filename, sizeof(filename),
+							      udev_device_get_syspath(event->dev), "/", tmp, NULL);
 					}
-
+				}
 				attr_subst_subdir(filename, sizeof(filename));
 
 				match = (stat(filename, &statbuf) == 0);
@@ -2168,8 +2145,7 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event
 
 				free(event->program_result);
 				event->program_result = NULL;
-				util_strlcpy(program, &rules->buf[cur->key.value_off], sizeof(program));
-				udev_event_apply_format(event, program, sizeof(program));
+				udev_event_apply_format(event, &rules->buf[cur->key.value_off], program, sizeof(program));
 				envp = udev_device_get_properties_envp(event->dev);
 				info(event->udev, "PROGRAM '%s' %s:%u\n",
 				     program,
@@ -2198,8 +2174,7 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event
 			{
 				char import[UTIL_PATH_SIZE];
 
-				util_strlcpy(import, &rules->buf[cur->key.value_off], sizeof(import));
-				udev_event_apply_format(event, import, sizeof(import));
+				udev_event_apply_format(event, &rules->buf[cur->key.value_off], import, sizeof(import));
 				if (import_file_into_properties(event->dev, import) != 0)
 					if (cur->key.op != OP_NOMATCH)
 						goto nomatch;
@@ -2209,8 +2184,7 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event
 			{
 				char import[UTIL_PATH_SIZE];
 
-				util_strlcpy(import, &rules->buf[cur->key.value_off], sizeof(import));
-				udev_event_apply_format(event, import, sizeof(import));
+				udev_event_apply_format(event, &rules->buf[cur->key.value_off], import, sizeof(import));
 				info(event->udev, "IMPORT '%s' %s:%u\n",
 				     import,
 				     &rules->buf[rule->rule.filename_off],
@@ -2224,8 +2198,7 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event
 			{
 				char import[UTIL_PATH_SIZE];
 
-				util_strlcpy(import, &rules->buf[cur->key.value_off], sizeof(import));
-				udev_event_apply_format(event, import, sizeof(import));
+				udev_event_apply_format(event, &rules->buf[cur->key.value_off], import, sizeof(import));
 				if (import_parent_into_properties(event->dev, import) != 0)
 					if (cur->key.op != OP_NOMATCH)
 						goto nomatch;
@@ -2254,7 +2227,7 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event
 			udev_device_set_num_fake_partitions(event->dev, cur->key.num_fake_part);
 			break;
 		case TK_A_INOTIFY_WATCH:
-			event->inotify_watch = 1;
+			event->inotify_watch = cur->key.watch;
 			break;
 		case TK_A_DEVLINK_PRIO:
 			udev_device_set_devlink_priority(event->dev, cur->key.devlink_prio);
@@ -2267,8 +2240,7 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event
 					break;
 				if (cur->key.op == OP_ASSIGN_FINAL)
 					event->owner_final = 1;
-				util_strlcpy(owner,  &rules->buf[cur->key.value_off], sizeof(owner));
-				udev_event_apply_format(event, owner, sizeof(owner));
+				udev_event_apply_format(event, &rules->buf[cur->key.value_off], owner, sizeof(owner));
 				event->uid = util_lookup_user(event->udev, owner);
 				info(event->udev, "OWNER %u %s:%u\n",
 				     event->uid,
@@ -2284,8 +2256,7 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event
 					break;
 				if (cur->key.op == OP_ASSIGN_FINAL)
 					event->group_final = 1;
-				util_strlcpy(group, &rules->buf[cur->key.value_off], sizeof(group));
-				udev_event_apply_format(event, group, sizeof(group));
+				udev_event_apply_format(event, &rules->buf[cur->key.value_off], group, sizeof(group));
 				event->gid = util_lookup_group(event->udev, group);
 				info(event->udev, "GROUP %u %s:%u\n",
 				     event->gid,
@@ -2302,8 +2273,7 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event
 					break;
 				if (cur->key.op == OP_ASSIGN_FINAL)
 					event->mode_final = 1;
-				util_strlcpy(mode, &rules->buf[cur->key.value_off], sizeof(mode));
-				udev_event_apply_format(event, mode, sizeof(mode));
+				udev_event_apply_format(event, &rules->buf[cur->key.value_off], mode, sizeof(mode));
 				event->mode = strtol(mode, &endptr, 8);
 				if (endptr[0] != '\0') {
 					err(event->udev, "invalide mode '%s' set default mode 0660\n", mode);
@@ -2357,8 +2327,7 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event
 					char temp_value[UTIL_NAME_SIZE];
 					struct udev_list_entry *entry;
 
-					util_strlcpy(temp_value, value, sizeof(temp_value));
-					udev_event_apply_format(event, temp_value, sizeof(temp_value));
+					udev_event_apply_format(event, value, temp_value, sizeof(temp_value));
 					entry = udev_device_add_property(event->dev, name, temp_value);
 					/* store in db */
 					udev_list_entry_set_flag(entry, 1);
@@ -2377,8 +2346,7 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event
 					break;
 				if (cur->key.op == OP_ASSIGN_FINAL)
 					event->name_final = 1;
-				util_strlcpy(name_str, name, sizeof(name_str));
-				udev_event_apply_format(event, name_str, sizeof(name_str));
+				udev_event_apply_format(event, name, name_str, sizeof(name_str));
 				if (esc == ESCAPE_UNSET || esc == ESCAPE_REPLACE) {
 					count = udev_util_replace_chars(name_str, "/");
 					if (count > 0)
@@ -2409,8 +2377,7 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event
 					udev_device_cleanup_devlinks_list(event->dev);
 
 				/* allow  multiple symlinks separated by spaces */
-				util_strlcpy(temp, &rules->buf[cur->key.value_off], sizeof(temp));
-				udev_event_apply_format(event, temp, sizeof(temp));
+				udev_event_apply_format(event, &rules->buf[cur->key.value_off], temp, sizeof(temp));
 				if (esc == ESCAPE_UNSET)
 					count = udev_util_replace_chars(temp, "/ ");
 				else if (esc == ESCAPE_REPLACE)
@@ -2428,9 +2395,7 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event
 					     pos,
 					     &rules->buf[rule->rule.filename_off],
 					     rule->rule.filename_line);
-					util_strlcpy(filename, udev_get_dev_path(event->udev), sizeof(filename));
-					util_strlcat(filename, "/", sizeof(filename));
-					util_strlcat(filename, pos, sizeof(filename));
+					util_strscpyl(filename, sizeof(filename), udev_get_dev_path(event->udev), "/", pos, NULL);
 					udev_device_add_devlink(event->dev, filename);
 					while (isspace(next[1]))
 						next++;
@@ -2442,9 +2407,7 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event
 					     pos,
 					     &rules->buf[rule->rule.filename_off],
 					     rule->rule.filename_line);
-					util_strlcpy(filename, udev_get_dev_path(event->udev), sizeof(filename));
-					util_strlcat(filename, "/", sizeof(filename));
-					util_strlcat(filename, pos, sizeof(filename));
+					util_strscpyl(filename, sizeof(filename), udev_get_dev_path(event->udev), "/", pos, NULL);
 					udev_device_add_devlink(event->dev, filename);
 				}
 			}
@@ -2462,17 +2425,11 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event
 				char value[UTIL_NAME_SIZE];
 				FILE *f;
 
-				util_strlcpy(attr, key_name, sizeof(attr));
-				if (util_resolve_subsys_kernel(event->udev, key_name, attr, sizeof(attr), 0) != 0) {
-					util_strlcpy(attr, udev_device_get_syspath(event->dev), sizeof(attr));
-					util_strlcat(attr, "/", sizeof(attr));
-					util_strlcat(attr, key_name, sizeof(attr));
-				}
-
+				if (util_resolve_subsys_kernel(event->udev, key_name, attr, sizeof(attr), 0) != 0)
+					util_strscpyl(attr, sizeof(attr), udev_device_get_syspath(event->dev), "/", key_name, NULL);
 				attr_subst_subdir(attr, sizeof(attr));
 
-				util_strlcpy(value, &rules->buf[cur->key.value_off], sizeof(value));
-				udev_event_apply_format(event, value, sizeof(value));
+				udev_event_apply_format(event, &rules->buf[cur->key.value_off], value, sizeof(value));
 				info(event->udev, "ATTR '%s' writing '%s' %s:%u\n", attr, value,
 				     &rules->buf[rule->rule.filename_off],
 				     rule->rule.filename_line);
@@ -2503,6 +2460,8 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event
 				break;
 			}
 		case TK_A_GOTO:
+			if (cur->key.rule_goto == 0)
+				break;
 			cur = &rules->tokens[cur->key.rule_goto];
 			continue;
 		case TK_A_LAST_RULE: