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

diff --git a/udev.h b/udev.h
index 4c8914f1e..656c1b7d8 100644
--- a/udev.h
+++ b/udev.h
@@ -24,7 +24,7 @@
 #define UDEV_H
 
 #include "libsysfs/libsysfs.h"
-#include <limits.h>
+#include <sys/param.h>
 
 #ifdef DEBUG
 #include <syslog.h>
@@ -50,23 +50,12 @@
 extern int log_message (int level, const char *format, ...)
 	__attribute__ ((format (printf, 2, 3)));
 
-
-/* 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 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];
@@ -75,19 +64,34 @@ 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];
+	unsigned char kernel_name[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;
 extern char sysfs_path[SYSFS_PATH_MAX];
-extern char *udev_config_dir;
-extern char *udev_root;
+extern char udev_root[PATH_MAX];
 extern char udev_db_filename[PATH_MAX+NAME_MAX];
-extern char udev_config_permission_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
-