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

diff --git a/udev.h b/udev.h
index 8e35cb708..f854a183d 100644
--- a/udev.h
+++ b/udev.h
@@ -24,41 +24,14 @@
 #define UDEV_H
 
 #include "libsysfs/libsysfs.h"
-#include <limits.h>
-
-#ifdef DEBUG
-#include <syslog.h>
-#define dbg(format, arg...)								\
-	do {										\
-		log_message (LOG_DEBUG , "%s: " format , __FUNCTION__ , ## arg);	\
-	} while (0)
-#else
-	#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
+#include <sys/param.h>
 
-
-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 COMMENT_CHARACTER		'#'
 
 #define NAME_SIZE	100
 #define OWNER_SIZE	30
 #define GROUP_SIZE	30
+#define MODE_SIZE	8
 
 struct udevice {
 	char name[NAME_SIZE];
@@ -68,12 +41,13 @@ 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 program_result[NAME_SIZE];
 	unsigned char kernel_number[NAME_SIZE];
-
+	unsigned char kernel_name[NAME_SIZE];
 };
 
 #define strfieldcpy(to, from) \
@@ -84,14 +58,19 @@ do { \
 
 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 int parse_get_pair(char **orig_string, char **left, char **right);
 
 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[MODE_SIZE];
+extern char default_owner_str[OWNER_SIZE];
+extern char default_group_str[GROUP_SIZE];
 
 #endif