udev.h   udev.h 
skipping to change at line 30 skipping to change at line 30
*/ */
#ifndef _UDEV_H_ #ifndef _UDEV_H_
#define _UDEV_H_ #define _UDEV_H_
#include <sys/types.h> #include <sys/types.h>
#include <sys/param.h> #include <sys/param.h>
#include "list.h" #include "list.h"
#include "logging.h" #include "logging.h"
#include "udev_libc_wrapper.h" #include "udev_sysdeps.h"
#include "udev_version.h" #include "udev_version.h"
#define COMMENT_CHARACTER '#' #define COMMENT_CHARACTER '#'
#define PATH_TO_NAME_CHAR '@' #define PATH_TO_NAME_CHAR '@'
#define LINE_SIZE 512 #define LINE_SIZE 512
#define PATH_SIZE 512 #define PATH_SIZE 512
#define NAME_SIZE 128 #define NAME_SIZE 128
#define VALUE_SIZE 128 #define VALUE_SIZE 128
#define DEFAULT_PARTITIONS_COUNT 15 #define DEFAULT_PARTITIONS_COUNT 15
skipping to change at line 57 skipping to change at line 57
#define WRITE_END 1 #define WRITE_END 1
#define DB_DIR ".udev/db" #define DB_DIR ".udev/db"
struct udev_rules; struct udev_rules;
struct sysfs_device { struct sysfs_device {
struct list_head node; /* for device cache */ struct list_head node; /* for device cache */
struct sysfs_device *parent; /* already cached parent*/ struct sysfs_device *parent; /* already cached parent*/
char devpath[PATH_SIZE]; char devpath[PATH_SIZE];
char subsystem[NAME_SIZE]; /* $class/$bus/"drivers" */ char subsystem[NAME_SIZE]; /* $class, $bus, drivers, mo
char kernel_name[NAME_SIZE]; /* device instance name */ dule */
char kernel[NAME_SIZE]; /* device instance name */
char kernel_number[NAME_SIZE]; char kernel_number[NAME_SIZE];
char driver[NAME_SIZE]; /* device driver name */ char driver[NAME_SIZE]; /* device driver name */
}; };
struct udevice { struct udevice {
/* device event */ /* device event */
struct sysfs_device *dev; /* points to dev_local by de fault */ struct sysfs_device *dev; /* points to dev_local by de fault */
struct sysfs_device dev_local; struct sysfs_device dev_local;
struct sysfs_device *dev_parent; /* current parent device use d for matching */ struct sysfs_device *dev_parent; /* current parent device use d for matching */
char action[NAME_SIZE]; char action[NAME_SIZE];
skipping to change at line 142 skipping to change at line 142
/* udev_utils.c */ /* udev_utils.c */
struct name_entry { struct name_entry {
struct list_head node; struct list_head node;
char name[PATH_SIZE]; char name[PATH_SIZE];
}; };
extern int log_priority(const char *priority); extern int log_priority(const char *priority);
extern char *name_list_add(struct list_head *name_list, const char *name, i nt sort); extern char *name_list_add(struct list_head *name_list, const char *name, i nt sort);
extern char *name_list_key_add(struct list_head *name_list, const char *key , const char *value); extern char *name_list_key_add(struct list_head *name_list, const char *key , const char *value);
extern void name_list_cleanup(struct list_head *name_list); extern void name_list_cleanup(struct list_head *name_list);
extern int add_matching_files(struct list_head *name_list, const char *dirn ame, const char *suffix); extern int add_matching_files(struct list_head *name_list, const char *dirn ame, const char *suffix);
extern uid_t lookup_user(const char *user);
extern gid_t lookup_group(const char *group);
/* udev_utils_string.c */ /* udev_utils_string.c */
extern int strcmp_pattern(const char *p, const char *s); extern int strcmp_pattern(const char *p, const char *s);
extern int string_is_true(const char *str); extern int string_is_true(const char *str);
extern void remove_trailing_chars(char *path, char c); extern void remove_trailing_chars(char *path, char c);
extern int utf8_encoded_valid_unichar(const char *str); extern int utf8_encoded_valid_unichar(const char *str);
extern int replace_untrusted_chars(char *str); extern int replace_untrusted_chars(char *str);
/* udev_utils_file.c */ /* udev_utils_file.c */
extern int create_path(const char *path); extern int create_path(const char *path);
 End of changes. 3 change blocks. 
3 lines changed or deleted 6 lines changed or added


 udev_rules.h   udev_rules.h 
skipping to change at line 63 skipping to change at line 63
}; };
enum import_type { enum import_type {
IMPORT_UNSET, IMPORT_UNSET,
IMPORT_PROGRAM, IMPORT_PROGRAM,
IMPORT_FILE, IMPORT_FILE,
IMPORT_PARENT, IMPORT_PARENT,
}; };
struct udev_rule { struct udev_rule {
struct key label;
struct key goto_label;
struct key kernel_name;
struct key subsystem;
struct key action; struct key action;
struct key devpath; struct key devpath;
struct key bus; struct key kernel;
struct key id; struct key subsystem;
struct key driver; struct key driver;
struct key_pairs attr;
struct key kernels;
struct key subsystems;
struct key drivers;
struct key_pairs attrs;
struct key_pairs env;
struct key program; struct key program;
struct key result; struct key result;
struct key import; struct key import;
enum import_type import_type; enum import_type import_type;
struct key run;
struct key wait_for_sysfs; struct key wait_for_sysfs;
struct key_pairs sysfs; struct key label;
struct key_pairs env; struct key goto_label;
struct key name; struct key name;
struct key symlink; struct key symlink;
struct key run;
struct key owner; struct key owner;
struct key group; struct key group;
enum key_operation mode_operation;
mode_t mode; mode_t mode;
enum key_operation mode_operation;
unsigned int partitions; unsigned int partitions;
unsigned int last_rule:1, unsigned int last_rule:1,
ignore_device:1, ignore_device:1,
ignore_remove:1; ignore_remove:1;
size_t bufsize; size_t bufsize;
char buf[]; char buf[];
}; };
 End of changes. 8 change blocks. 
10 lines changed or deleted 14 lines changed or added


 udev_version.h   udev_version.h 
/* Generated by make. */ /* Generated by make. */
#define UDEV_VERSION "097" #define UDEV_VERSION "098"
#define UDEV_ROOT "/dev" #define UDEV_ROOT "/dev"
#define UDEV_CONFIG_FILE "/etc/udev/udev.conf" #define UDEV_CONFIG_FILE "/etc/udev/udev.conf"
#define UDEV_RULES_FILE "/etc/udev/rules.d" #define UDEV_RULES_FILE "/etc/udev/rules.d"
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/