X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev.h;h=7038376b3c23ab44ea4b83e69e705e5010fa428e;hb=55b0508969652acc71114b0b1205226ad3d27f39;hp=2c5270a4c34bd28cee6c8c064d69dc0e9d2e1901;hpb=45a7b668eca398831c0cfc39e4237494b3d603e9;p=elogind.git diff --git a/udev.h b/udev.h index 2c5270a4c..7038376b3 100644 --- a/udev.h +++ b/udev.h @@ -30,9 +30,7 @@ #define COMMENT_CHARACTER '#' #define NAME_SIZE 256 -#define OWNER_SIZE 32 -#define GROUP_SIZE 32 -#define MODE_SIZE 8 +#define USER_SIZE 32 #define ACTION_SIZE 32 #define DEVPATH_SIZE 256 @@ -50,24 +48,25 @@ struct udevice { char devpath[DEVPATH_SIZE]; char subsystem[SUBSYSTEM_SIZE]; + char name[NAME_SIZE]; - char owner[OWNER_SIZE]; - char group[GROUP_SIZE]; + char symlink[NAME_SIZE]; + char owner[USER_SIZE]; + char group[USER_SIZE]; + mode_t mode; char type; int major; int minor; - mode_t mode; - char symlink[NAME_SIZE]; + + char devname[NAME_SIZE]; int partitions; int ignore_remove; int config_line; char config_file[NAME_SIZE]; - long config_uptime; char bus_id[SYSFS_NAME_LEN]; char program_result[NAME_SIZE]; char kernel_number[NAME_SIZE]; char kernel_name[NAME_SIZE]; - char devname[NAME_SIZE]; int test_run; }; @@ -84,9 +83,9 @@ extern char udev_db_path[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 mode_t default_mode; +extern char default_owner[USER_SIZE]; +extern char default_group[USER_SIZE]; extern int udev_log; extern int udev_dev_d; extern int udev_hotplug_d;