X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev.h;h=65cbf42b511f341db3a12d69c8ea426f67d0f6c3;hp=4acbb61391fbb3e58eb3a5b4f42266881c187707;hb=e4c89108001a9af3b8c132111d63980e3a1dcaf4;hpb=e8bacccab296d6b75c4c9f43cb4e71007aff5b8a

diff --git a/udev.h b/udev.h
index 4acbb6139..65cbf42b5 100644
--- a/udev.h
+++ b/udev.h
@@ -20,48 +20,25 @@
  *
  */
 
-#ifndef UDEV_H
-#define UDEV_H
+#ifndef _UDEV_H_
+#define _UDEV_H_
 
-#include "libsysfs/libsysfs.h"
 #include <sys/param.h>
+#include "libsysfs/sysfs/libsysfs.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
-
-
-extern int log_message (int level, const char *format, ...)
-	__attribute__ ((format (printf, 2, 3)));
-
+#define COMMENT_CHARACTER		'#'
 
-/* default filenames for the config and database files */
-#define UDEV_CONFIG_FILE		"udev.conf"
-#define UDEV_DB				".udev.tdb"
-#define UDEV_RULES_FILE			"udev.rules"
-#define UDEV_PERMISSION_FILE		"udev.permissions"
+#define NAME_SIZE			256
+#define OWNER_SIZE			30
+#define GROUP_SIZE			30
+#define MODE_SIZE			8
 
-#define COMMENT_CHARACTER		'#'
+#define ACTION_SIZE			30
+#define DEVPATH_SIZE			255
+#define SUBSYSTEM_SIZE			30
 
-#define NAME_SIZE	100
-#define OWNER_SIZE	30
-#define GROUP_SIZE	30
+/* length of public data */
+#define UDEVICE_LEN (offsetof(struct udevice, bus_id))
 
 struct udevice {
 	char name[NAME_SIZE];
@@ -70,33 +47,34 @@ struct udevice {
 	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];
-
+	unsigned int mode;	/* not mode_t due to conflicting definitions in different libcs */
+	char symlink[NAME_SIZE];
+	int partitions;
+
+	/* private data that help us in building strings */
+	char bus_id[SYSFS_NAME_LEN];
+	char program_result[NAME_SIZE];
+	char kernel_number[NAME_SIZE];
+	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_add_device(char *path, char *subsystem, int fake);
 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[PATH_MAX];
 extern char udev_root[PATH_MAX];
 extern char udev_db_filename[PATH_MAX+NAME_MAX];
-extern char udev_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];
+extern int udev_log;
+extern int udev_sleep;
 
 #endif