X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev.h;h=e615b4c8bb9e6a88b78d1e1ac72686ae349e3b73;hb=aa3400ae6d621db5d257340c1b07cb8ca6190913;hp=90aa82393911bafece7d3d9d59ef9882e9214aff;hpb=54988802b795328ceba29480611102902e88f572;p=elogind.git

diff --git a/udev.h b/udev.h
index 90aa82393..e615b4c8b 100644
--- a/udev.h
+++ b/udev.h
@@ -24,6 +24,7 @@
 #define UDEV_H
 
 #include "libsysfs/libsysfs.h"
+#include <stddef.h>
 #include <sys/param.h>
 
 #define COMMENT_CHARACTER		'#'
@@ -31,6 +32,10 @@
 #define NAME_SIZE	100
 #define OWNER_SIZE	30
 #define GROUP_SIZE	30
+#define MODE_SIZE	8
+
+/* length of public data */
+#define UDEVICE_LEN (offsetof(struct udevice, bus_id))
 
 struct udevice {
 	char name[NAME_SIZE];
@@ -39,14 +44,14 @@ struct udevice {
 	char type;
 	int major;
 	int minor;
-	mode_t mode;
+	unsigned int mode;	/* not mode_t due to conflicting definitions in different libcs */
 	char symlink[NAME_SIZE];
 
-	/* fields that help us in building strings */
-	unsigned char bus_id[SYSFS_NAME_LEN];
-	unsigned char program_result[NAME_SIZE];
-	unsigned char kernel_number[NAME_SIZE];
-	unsigned char kernel_name[NAME_SIZE];
+	/* private data that help us in building strings */
+	char bus_id[SYSFS_NAME_LEN];
+	char program_result[NAME_SIZE];
+	char kernel_number[NAME_SIZE];
+	char kernel_name[NAME_SIZE];
 };
 
 #define strfieldcpy(to, from) \
@@ -55,9 +60,10 @@ do { \
 	strncpy(to, from, sizeof(to)-1); \
 } while (0)
 
-extern int udev_add_device(char *path, char *subsystem);
+extern int udev_add_device(char *path, char *subsystem, int fake);
 extern int udev_remove_device(char *path, char *subsystem);
 extern void udev_init_config(void);
+extern int parse_get_pair(char **orig_string, char **left, char **right);
 
 extern char **main_argv;
 extern char **main_envp;
@@ -67,6 +73,9 @@ extern char udev_db_filename[PATH_MAX+NAME_MAX];
 extern char udev_permissions_filename[PATH_MAX+NAME_MAX];
 extern char udev_config_filename[PATH_MAX+NAME_MAX];
 extern char udev_rules_filename[PATH_MAX+NAME_MAX];
-extern char default_mode_str[NAME_MAX];
+extern char default_mode_str[MODE_SIZE];
+extern char default_owner_str[OWNER_SIZE];
+extern char default_group_str[GROUP_SIZE];
+extern int udev_log;
 
 #endif