X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev_rules.h;h=da5ac3ea18c9a528d7517f8c663bf74f00053c88;hp=2c956fccccef3c9f2d48727baf6aa826eac5b2f4;hb=661a0bea80d129d5df708e36dbaed745c9d8392e;hpb=891205121395acbe84eb6173670ce7934cd9b1c6

diff --git a/udev_rules.h b/udev_rules.h
index 2c956fccc..da5ac3ea1 100644
--- a/udev_rules.h
+++ b/udev_rules.h
@@ -1,8 +1,6 @@
 /*
- * udev_rules.h
- *
  * Copyright (C) 2003-2004 Greg Kroah-Hartman <greg@kroah.com>
- * Copyright (C) 2004-2005 Kay Sievers <kay.sievers@vrfy.org>
+ * Copyright (C) 2004-2006 Kay Sievers <kay.sievers@vrfy.org>
  *
  *	This program is free software; you can redistribute it and/or modify it
  *	under the terms of the GNU General Public License as published by the
@@ -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.
  *
  */
 
@@ -26,7 +24,7 @@
 #include "list.h"
 
 #define PAIRS_MAX		5
-#define RULEFILE_SUFFIX		".rules"
+#define RULESFILE_SUFFIX	".rules"
 
 enum key_operation {
 	KEY_OP_UNSET,
@@ -59,34 +57,50 @@ enum import_type {
 	IMPORT_PARENT,
 };
 
+enum escape_type {
+	ESCAPE_UNSET,
+	ESCAPE_NONE,
+	ESCAPE_REPLACE,
+};
+
 struct udev_rule {
-	struct key label;
-	struct key goto_label;
-	struct key kernel_name;
-	struct key subsystem;
 	struct key action;
 	struct key devpath;
-	struct key bus;
-	struct key id;
+	struct key kernel;
+	struct key subsystem;
 	struct key driver;
+	struct key_pairs attr;
+
+	struct key kernels;
+	struct key subsystems;
+	struct key drivers;
+	struct key_pairs attrs;
+
+	struct key_pairs env;
 	struct key program;
 	struct key result;
 	struct key import;
 	enum import_type import_type;
+	struct key test;
+	mode_t test_mode_mask;
+	struct key run;
 	struct key wait_for_sysfs;
-	struct key_pairs sysfs;
-	struct key_pairs env;
+	struct key label;
+	struct key goto_label;
 
 	struct key name;
 	struct key symlink;
-	struct key run;
+	struct key symlink_match;
 	struct key owner;
 	struct key group;
-	enum key_operation mode_operation;
-	mode_t mode;
+	struct key mode;
+	enum escape_type string_escape;
 
+	unsigned int link_priority;
+	int event_timeout;
 	unsigned int partitions;
 	unsigned int last_rule:1,
+		     run_ignore_error:1,
 		     ignore_device:1,
 		     ignore_remove:1;
 
@@ -110,6 +124,7 @@ extern struct udev_rule *udev_rules_iter_label(struct udev_rules *rules, const c
 
 extern int udev_rules_get_name(struct udev_rules *rules, struct udevice *udev);
 extern int udev_rules_get_run(struct udev_rules *rules, struct udevice *udev);
+extern int udev_rules_run(struct udevice *udev);
 
 extern void udev_rules_apply_format(struct udevice *udev, char *string, size_t maxsize);