X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev.h;h=6798f136663275fc05198fbc3def8d39b0023781;hp=4c8914f1e2b4727d32d7976d743f94b6609f76bd;hb=fee6f4150d0d5fbfc1ba74130bac1ae21ce69c81;hpb=c056c5141b16fe95485eeb233fe8b90954686a60

diff --git a/udev.h b/udev.h
index 4c8914f1e..6798f1366 100644
--- a/udev.h
+++ b/udev.h
@@ -52,21 +52,14 @@ extern int log_message (int level, const char *format, ...)
 
 
 /* filenames for the config and database files */
-#define UDEV_DB				"udevdb.tdb"
-#define NAMEDEV_CONFIG_PERMISSION_FILE	"namedev.permissions"
-#define NAMEDEV_CONFIG_FILE		"namedev.config"
+#define UDEV_DB				"udev.tdb"
+#define UDEV_CONFIG_PERMISSION_FILE	"udev.permissions"
+#define UDEV_CONFIG_FILE		"udev.config"
 
 #define NAME_SIZE	100
 #define OWNER_SIZE	30
 #define GROUP_SIZE	30
 
-struct device_attr {
-	char name[NAME_SIZE];
-	char owner[OWNER_SIZE];
-	char group[GROUP_SIZE];
-	mode_t mode;
-};
-
 struct udevice {
 	char name[NAME_SIZE];
 	char owner[OWNER_SIZE];
@@ -75,8 +68,20 @@ struct udevice {
 	int major;
 	int minor;
 	mode_t mode;
+
+	/* fields that help us in building strings */
+	unsigned char bus_id[SYSFS_NAME_LEN];
+	unsigned char callout_value[NAME_SIZE];
+	unsigned char kernel_number[NAME_SIZE];
+
 };
 
+#define strfieldcpy(to, from) \
+do { \
+	to[sizeof(to)-1] = '\0'; \
+	strncpy(to, from, sizeof(to)-1); \
+} while (0)
+
 extern int udev_add_device(char *path, char *subsystem);
 extern int udev_remove_device(char *path, char *subsystem);