[PATCH] Fix bug causing udev to sleep forever waiting for dev file to show up.

[elogind.git] / udev.h

diff --git a/udev.h b/udev.h
index 33cb89af5542ef6684971cc6e90c0514325e85b1..4c8914f1e2b4727d32d7976d743f94b6609f76bd 100644 (file)
--- 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>
@@ -49,7 +51,10 @@ extern int log_message (int level, const char *format, ...)
        __attribute__ ((format (printf, 2, 3)));
 
 
-/* Lots of constants that should be in a config file sometime */
+/* 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 NAME_SIZE      100
 #define OWNER_SIZE     30
@@ -59,13 +64,30 @@ struct device_attr {
        char name[NAME_SIZE];
        char owner[OWNER_SIZE];
        char group[GROUP_SIZE];
-       int mode;
+       mode_t mode;
 };
 
-extern int udev_add_device(char *device, char *subsystem);
-extern int udev_remove_device(char *device, char *subsystem);
+struct udevice {
+       char name[NAME_SIZE];
+       char owner[OWNER_SIZE];
+       char group[GROUP_SIZE];
+       char type;
+       int major;
+       int minor;
+       mode_t mode;
+};
+
+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