X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev.h;h=89943074699daf8ef7cf690fb31aa89e7f5094ec;hb=36043f8418c8a0e8decb090c1ea22092fe9c976a;hp=33cb89af5542ef6684971cc6e90c0514325e85b1;hpb=6739707df53097ac378f8ff2f0aa694257e31da1;p=elogind.git

diff --git a/udev.h b/udev.h
index 33cb89af5..899430746 100644
--- a/udev.h
+++ b/udev.h
@@ -23,6 +23,8 @@
 #ifndef UDEV_H
 #define UDEV_H
 
+#include "libsysfs/libsysfs.h"
+#include <limits.h>
 
 #ifdef DEBUG
 #include <syslog.h>
@@ -49,23 +51,47 @@ 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 */
+/* filenames for the config and database files */
+#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 {
+struct udevice {
 	char name[NAME_SIZE];
 	char owner[OWNER_SIZE];
 	char group[GROUP_SIZE];
-	int mode;
+	char type;
+	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];
+
 };
 
-extern int udev_add_device(char *device, char *subsystem);
-extern int udev_remove_device(char *device, char *subsystem);
+#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 char **main_argv;
 extern char **main_envp;
-#endif
+extern char sysfs_path[SYSFS_PATH_MAX];
+extern char *udev_config_dir;
+extern char *udev_root;
+extern char udev_db_filename[PATH_MAX+NAME_MAX];
+extern char udev_config_permission_filename[PATH_MAX+NAME_MAX];
+extern char udev_config_filename[PATH_MAX+NAME_MAX];
 
+#endif