X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=namedev.h;h=7f875ed6030847b1cda40d81c195c1cf5a5a9403;hp=42b1e6c1a0a1cabd4db09d9729bf2e2ab160967f;hb=c58f8c3000b99db5c3810b9f8b1ecc2044070ac1;hpb=54988802b795328ceba29480611102902e88f572

diff --git a/namedev.h b/namedev.h
index 42b1e6c1a..7f875ed60 100644
--- a/namedev.h
+++ b/namedev.h
@@ -3,7 +3,7 @@
  *
  * Userspace devfs
  *
- * Copyright (C) 2003 Greg Kroah-Hartman <greg@kroah.com>
+ * Copyright (C) 2003,2004 Greg Kroah-Hartman <greg@kroah.com>
  *
  *	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
@@ -28,25 +28,31 @@
 
 struct sysfs_class_device;
 
-#define BUS_SIZE	30
-#define FILE_SIZE	50
-#define VALUE_SIZE	100
-#define ID_SIZE		50
-#define PLACE_SIZE	50
-#define PROGRAM_SIZE	100
-
-#define FIELD_BUS	"BUS"
-#define FIELD_SYSFS	"SYSFS_"
-#define FIELD_ID	"ID"
-#define FIELD_PLACE	"PLACE"
-#define FIELD_PROGRAM	"PROGRAM"
-#define FIELD_RESULT	"RESULT"
-#define FIELD_KERNEL	"KERNEL"
-#define FIELD_NAME	"NAME"
-#define FIELD_SYMLINK	"SYMLINK"
-
-#define PROGRAM_MAXARG	10
-#define MAX_SYSFS_PAIRS	5
+#define BUS_SIZE		30
+#define FILE_SIZE		50
+#define VALUE_SIZE		100
+#define ID_SIZE			50
+#define PLACE_SIZE		50
+#define PROGRAM_SIZE		100
+
+#define FIELD_BUS		"BUS"
+#define FIELD_SYSFS		"SYSFS"
+#define FIELD_ID		"ID"
+#define FIELD_PLACE		"PLACE"
+#define FIELD_PROGRAM		"PROGRAM"
+#define FIELD_RESULT		"RESULT"
+#define FIELD_KERNEL		"KERNEL"
+#define FIELD_NAME		"NAME"
+#define FIELD_SYMLINK		"SYMLINK"
+
+#define ATTR_PARTITIONS		"all_partitions"
+#define PARTITIONS_COUNT	15
+
+#define PROGRAM_MAXARG		10
+#define MAX_SYSFS_PAIRS		5
+
+#define RULEFILE_EXT		".rules"
+#define PERMFILE_EXT		".permissions"
 
 struct sysfs_pair {
 	char file[FILE_SIZE];
@@ -65,6 +71,8 @@ struct config_device {
 	char name[NAME_SIZE];
 	char symlink[NAME_SIZE];
 	struct sysfs_pair sysfs_pair[MAX_SYSFS_PAIRS];
+	int partitions;
+	char config_file[NAME_SIZE];
 	int config_line;
 };
 
@@ -74,7 +82,7 @@ struct perm_device {
 	char name[NAME_SIZE];
 	char owner[OWNER_SIZE];
 	char group[GROUP_SIZE];
-	mode_t mode;
+	unsigned int mode;
 };
 
 extern struct list_head config_device_list;
@@ -91,6 +99,4 @@ extern void dump_config_dev_list(void);
 extern void dump_perm_dev(struct perm_device *dev);
 extern void dump_perm_dev_list(void);
 
-extern int get_pair(char **orig_string, char **left, char **right);
-
 #endif