X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev.h;h=05f6b3c2256be08a72860b7399e09c8ed24b2364;hb=54b72ce91eec6116f14f5fa5abefb2e6210df795;hp=89943074699daf8ef7cf690fb31aa89e7f5094ec;hpb=49d72e43487164194263d2c80dd27a4627f2169c;p=elogind.git diff --git a/udev.h b/udev.h index 899430746..05f6b3c22 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 @@ -68,6 +64,7 @@ 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]; @@ -84,14 +81,16 @@ 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]; +extern char default_mode_str[NAME_MAX]; #endif