X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev.h;h=05f6b3c2256be08a72860b7399e09c8ed24b2364;hp=6d7017ff511b07bdaee729e5368e505e3d2dbb58;hb=7ac0feeb6044470569d7ece5d34a76acdb03fc64;hpb=5840bc63e2029d22682d8de77dc8fcc4da1b436c

diff --git a/udev.h b/udev.h
index 6d7017ff5..05f6b3c22 100644
--- a/udev.h
+++ b/udev.h
@@ -24,6 +24,7 @@
 #define UDEV_H
 
 #include "libsysfs/libsysfs.h"
+#include <sys/param.h>
 
 #ifdef DEBUG
 #include <syslog.h>
@@ -49,20 +50,12 @@
 extern int log_message (int level, const char *format, ...)
 	__attribute__ ((format (printf, 2, 3)));
 
-
-/* Lots of constants that should be in a config file sometime */
+#define COMMENT_CHARACTER		'#'
 
 #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];
@@ -71,12 +64,33 @@ struct udevice {
 	int major;
 	int minor;
 	mode_t mode;
+	char symlink[NAME_SIZE];
+
+	/* 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);
+extern void udev_init_config(void);
 
 extern char **main_argv;
 extern char **main_envp;
-#endif
+extern char sysfs_path[SYSFS_PATH_MAX];
+extern char udev_root[PATH_MAX];
+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];
 
+#endif