X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev.h;h=1a899bb40a816f49e6d619da04ca4fad1c9e28f4;hp=6798f136663275fc05198fbc3def8d39b0023781;hb=3836a3c49a72b9ee0b092725628f30839f100c4f;hpb=f3b04a2e0a041aa5546284c5bfc2022ab3e8b15f diff --git a/udev.h b/udev.h index 6798f1366..1a899bb40 100644 --- a/udev.h +++ b/udev.h @@ -24,7 +24,7 @@ #define UDEV_H #include "libsysfs/libsysfs.h" -#include +#include #ifdef DEBUG #include @@ -50,11 +50,7 @@ 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 @@ -84,15 +80,15 @@ 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 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]; #endif -