X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev.h;h=8e35cb708fcd952677025a60c65ac699cf17a96e;hp=59c374365ea44d438e1e8dff052f5eb139811dce;hb=f7b4eca455c7dbf850d984892756f22dbd9ddc3d;hpb=ea733a2f00174c3a39c8eb783e330b6a69abd67c

diff --git a/udev.h b/udev.h
index 59c374365..8e35cb708 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>
@@ -34,37 +36,62 @@
 	#define dbg(format, arg...) do { } while (0)
 #endif
 
+/* Parser needs it's own debugging statement, we usually don't care about this at all */
+#ifdef DEBUG_PARSER
+#define dbg_parse(format, arg...)							\
+	do {										\
+		log_message (LOG_DEBUG , "%s: " format , __FUNCTION__ , ## arg);	\
+	} while (0)
+#else
+	#define dbg_parse(format, arg...) do { } while (0)
+#endif
 
-/* Lots of constants that should be in a config file sometime */
-
-/* Location of sysfs mount */
-#define SYSFS_ROOT	"/sys"
-
-/* Where udev should create its device nodes, trailing / needed */
-#define UDEV_ROOT	"/udev/"
-
-/* device file in sysfs that contains major/minor number, leading / needed */
-#define DEV_FILE	"/dev"
-
-/* Binaries that udev calls to do stuff */
-#define MKNOD		"/bin/mknod"
 
 extern int log_message (int level, const char *format, ...)
 	__attribute__ ((format (printf, 2, 3)));
 
+
+/* 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)
 
-#endif
+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;
+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