X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev.h;h=391dc2c41c06860c55c625979c358cc6601a27ca;hp=32fda379e54e467965bce37735580ab2540c6f92;hb=613ffbeb15e0507581e5037850c1ea5d56cd0928;hpb=ef672b3dc450846d540cf1a0519fe273bbd62e5f diff --git a/udev.h b/udev.h index 32fda379e..391dc2c41 100644 --- a/udev.h +++ b/udev.h @@ -4,6 +4,7 @@ * Userspace devfs * * Copyright (C) 2003 Greg Kroah-Hartman + * Copyright (C) 2003-2005 Kay Sievers * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -20,145 +21,79 @@ * */ -#ifndef UDEV_H -#define UDEV_H +#ifndef _UDEV_H_ +#define _UDEV_H_ -#include -#include -#include -#include +#include #include +#include "libsysfs/sysfs/libsysfs.h" +#include "list.h" #define COMMENT_CHARACTER '#' - -#define NAME_SIZE 100 -#define OWNER_SIZE 30 -#define GROUP_SIZE 30 -#define MODE_SIZE 8 - -#define ACTION_SIZE 30 -#define DEVPATH_SIZE 255 -#define SUBSYSTEM_SIZE 30 - -/* length of public data */ -#define UDEVICE_LEN (offsetof(struct udevice, bus_id)) +#define LINE_SIZE 512 +#define NAME_SIZE 128 +#define PATH_SIZE 256 +#define USER_SIZE 32 +#define SEQNUM_SIZE 32 +#define VALUE_SIZE 128 + +#define DEFAULT_PARTITIONS_COUNT 15 +#define UDEV_ALARM_TIMEOUT 120 + +enum device_type { + DEV_UNKNOWN, + DEV_CLASS, + DEV_BLOCK, + DEV_NET, + DEV_DEVICE, +}; struct udevice { - char name[NAME_SIZE]; - char owner[OWNER_SIZE]; - char group[GROUP_SIZE]; - char type; - int major; - int minor; - unsigned int mode; /* not mode_t due to conflicting definitions in different libcs */ - char symlink[NAME_SIZE]; + char devpath[PATH_SIZE]; + char subsystem[NAME_SIZE]; + char action[NAME_SIZE]; + + enum device_type type; + char name[PATH_SIZE]; + char devname[PATH_SIZE]; + struct list_head symlink_list; + int symlink_final; + char owner[USER_SIZE]; + int owner_final; + char group[USER_SIZE]; + int group_final; + mode_t mode; + int mode_final; + dev_t devt; + struct list_head run_list; + int run_final; + struct list_head env_list; + + char tmp_node[PATH_SIZE]; int partitions; - - /* private data that help us in building strings */ - char bus_id[SYSFS_NAME_LEN]; - char program_result[NAME_SIZE]; + int ignore_device; + int ignore_remove; + int config_line; + char config_file[PATH_SIZE]; + char bus_id[NAME_SIZE]; + char program_result[PATH_SIZE]; char kernel_number[NAME_SIZE]; char kernel_name[NAME_SIZE]; + int test_run; }; -#define strfieldcpy(to, from) \ -do { \ - to[sizeof(to)-1] = '\0'; \ - strncpy(to, from, sizeof(to)-1); \ -} while (0) - -#define strfieldcat(to, from) \ -do { \ - to[sizeof(to)-1] = '\0'; \ - strncat(to, from, sizeof(to) - strlen(to)-1); \ -} while (0) - -#define strnfieldcpy(to, from, maxsize) \ -do { \ - to[maxsize-1] = '\0'; \ - strncpy(to, from, maxsize-1); \ -} while (0) - -#define strnfieldcat(to, from, maxsize) \ -do { \ - to[maxsize-1] = '\0'; \ - strncat(to, from, maxsize - strlen(to)-1); \ -} while (0) - -#define strintcat(to, i) \ -do { \ - to[sizeof(to)-1] = '\0'; \ - snprintf((to) + strlen(to), sizeof(to) - strlen(to)-1, "%u", i); \ -} while (0) - -#define strnintcat(to, i, maxsize) \ -do { \ - to[maxsize-1] = '\0'; \ - snprintf((to) + strlen(to), maxsize - strlen(to)-1, "%u", i); \ -} while (0) - -#define foreach_strpart(str, separator, pos, len) \ - for(pos = str, len = 0; \ - (pos) < ((str) + strlen(str)); \ - pos = pos + len + strspn(pos, separator), len = strcspn(pos, separator)) \ - if (len > 0) - -static inline char *get_action(void) -{ - char *action; - - action = getenv("ACTION"); - if (action != NULL && strlen(action) > ACTION_SIZE) - action[ACTION_SIZE-1] = '\0'; - - return action; -} - -static inline char *get_devpath(void) -{ - char *devpath; - - devpath = getenv("DEVPATH"); - if (devpath != NULL && strlen(devpath) > DEVPATH_SIZE) - devpath[DEVPATH_SIZE-1] = '\0'; - - return devpath; -} - -static inline char *get_seqnum(void) -{ - char *seqnum; - - seqnum = getenv("SEQNUM"); - - return seqnum; -} - -static inline char *get_subsystem(char *subsystem) -{ - if (subsystem != NULL && strlen(subsystem) > SUBSYSTEM_SIZE) - subsystem[SUBSYSTEM_SIZE-1] = '\0'; - - return subsystem; -} - -extern int udev_add_device(char *path, char *subsystem, int fake); -extern int udev_remove_device(char *path, char *subsystem); +extern int udev_add_device(struct udevice *udev, struct sysfs_class_device *class_dev); +extern int udev_remove_device(struct udevice *udev); 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_root[PATH_MAX]; -extern char udev_db_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; +extern int udev_start(void); +extern int udev_make_node(struct udevice *udev, const char *file, dev_t devt, mode_t mode, uid_t uid, gid_t gid); + +extern char sysfs_path[PATH_SIZE]; +extern char udev_root[PATH_SIZE]; +extern char udev_db_path[PATH_SIZE]; +extern char udev_config_filename[PATH_SIZE]; +extern char udev_rules_filename[PATH_SIZE]; +extern int udev_log_priority; +extern int udev_run; #endif