X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev_rules.h;h=6d9d306dedc60e42b0b4ebb54bd5ec8a761f4e3d;hp=71c510bce5d07cfc2c644ace714bb76a99141633;hb=fd15e02dbbaa60cf2aff37e1e2a86b244564fe4a;hpb=e5e322bc627a07d29a07e08f7c96bd644a3ae057

diff --git a/udev_rules.h b/udev_rules.h
index 71c510bce..6d9d306de 100644
--- a/udev_rules.h
+++ b/udev_rules.h
@@ -1,9 +1,8 @@
 /*
  * udev_rules.h
  *
- * Userspace devfs
- *
- * Copyright (C) 2003,2004 Greg Kroah-Hartman <greg@kroah.com>
+ * Copyright (C) 2003-2004 Greg Kroah-Hartman <greg@kroah.com>
+ * Copyright (C) 2004-2005 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
@@ -20,75 +19,103 @@
  *
  */
 
-#ifndef NAMEDEV_H
-#define NAMEDEV_H
+#ifndef UDEV_RULES_H
+#define UDEV_RULES_H
 
 #include "libsysfs/sysfs/libsysfs.h"
 #include "udev.h"
 #include "list.h"
 
+#define PAIRS_MAX		5
+#define RULEFILE_SUFFIX		".rules"
 
-#define FIELD_KERNEL		"KERNEL"
-#define FIELD_SUBSYSTEM		"SUBSYSTEM"
-#define FIELD_BUS		"BUS"
-#define FIELD_SYSFS		"SYSFS"
-#define FIELD_ID		"ID"
-#define FIELD_PROGRAM		"PROGRAM"
-#define FIELD_RESULT		"RESULT"
-#define FIELD_DRIVER		"DRIVER"
-#define FIELD_NAME		"NAME"
-#define FIELD_SYMLINK		"SYMLINK"
-#define FIELD_OWNER		"OWNER"
-#define FIELD_GROUP		"GROUP"
-#define FIELD_MODE		"MODE"
-#define FIELD_OPTIONS		"OPTIONS"
+enum key_operation {
+	KEY_OP_UNSET,
+	KEY_OP_MATCH,
+	KEY_OP_NOMATCH,
+	KEY_OP_ADD,
+	KEY_OP_ASSIGN,
+	KEY_OP_ASSIGN_FINAL,
+};
 
-#define OPTION_IGNORE_DEVICE	"ignore_device"
-#define OPTION_IGNORE_REMOVE	"ignore_remove"
-#define OPTION_PARTITIONS	"all_partitions"
+struct key {
+	enum key_operation operation;
+	size_t val_off;
+};
 
-#define MAX_SYSFS_PAIRS		5
+struct key_pair {
+	struct key key;
+	size_t key_name_off;
+};
 
-#define RULEFILE_SUFFIX		".rules"
+struct key_pairs {
+	int count;
+	struct key_pair keys[PAIRS_MAX];
+};
 
-struct sysfs_pair {
-	char file[PATH_SIZE];
-	char value[VALUE_SIZE];
+enum import_type {
+	IMPORT_UNSET,
+	IMPORT_PROGRAM,
+	IMPORT_FILE,
+	IMPORT_PARENT,
 };
 
 struct udev_rule {
-	struct list_head node;
-
-	char kernel[NAME_SIZE];
-	char subsystem[NAME_SIZE];
-	char bus[NAME_SIZE];
-	char id[NAME_SIZE];
-	struct sysfs_pair sysfs_pair[MAX_SYSFS_PAIRS];
-	char program[PATH_SIZE];
-	char result[PATH_SIZE];
-	char driver[NAME_SIZE];
-	char name[PATH_SIZE];
-	char symlink[PATH_SIZE];
-
-	char owner[USER_SIZE];
-	char group[USER_SIZE];
+	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 driver;
+	struct key program;
+	struct key result;
+	struct key modalias;
+	struct key import;
+	enum import_type import_type;
+	struct key wait_for_sysfs;
+	struct key_pairs sysfs;
+	struct key_pairs env;
+
+	struct key name;
+	struct key symlink;
+	struct key run;
+	struct key owner;
+	struct key group;
+	enum key_operation mode_operation;
 	mode_t mode;
 
-	int partitions;
-	int ignore_device;
-	int ignore_remove;
+	unsigned int partitions;
+	unsigned int last_rule:1,
+		     ignore_device:1,
+		     ignore_remove:1;
 
-	char config_file[PATH_SIZE];
-	int config_line;
+	size_t bufsize;
+	char buf[];
 };
 
-extern struct list_head udev_rule_list;
+struct udev_rules {
+	char *buf;
+	size_t bufsize;
+	size_t current;
+	int resolve_names;
+};
+
+extern int udev_rules_init(struct udev_rules *rules, int resolve_names);
+extern void udev_rules_close(struct udev_rules *rules);
+
+extern void udev_apply_format(struct udevice *udev, char *string, size_t maxsize,
+			      struct sysfs_class_device *class_dev, struct sysfs_device *sysfs_device);
 
-extern int udev_rules_init(void);
-extern int udev_rules_get_name(struct udevice *udev, struct sysfs_class_device *class_dev);
-extern void udev_rules_close(void);
+extern void udev_rules_iter_init(struct udev_rules *rules);
+extern struct udev_rule *udev_rules_iter_next(struct udev_rules *rules);
+extern struct udev_rule *udev_rules_iter_label(struct udev_rules *rules, const char *label);
 
-extern void udev_rule_dump(struct udev_rule *rule);
-extern void udev_rule_list_dump(void);
+extern int udev_rules_get_name(struct udev_rules *rules, struct udevice *udev,
+			       struct sysfs_class_device *class_dev);
+extern int udev_rules_get_run(struct udev_rules *rules, struct udevice *udev,
+			      struct sysfs_class_device *class_dev, struct sysfs_device *sysfs_dev);
 
 #endif