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

diff --git a/udev.h b/udev.h
index 4c8914f1e..f854a183d 100644
--- a/udev.h
+++ b/udev.h
@@ -24,48 +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				"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;
-};
+#define MODE_SIZE	8
 
 struct udevice {
 	char name[NAME_SIZE];
@@ -75,19 +41,36 @@ 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 program_result[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 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
-