chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rules: SUSE update
[elogind.git]
/
udev.h
diff --git
a/udev.h
b/udev.h
index 200d7e83692808c89c2e93f0dec7bc17c42b6c13..9b22c42b8c3074ea96c18b6b3e370a63799d45e7 100644
(file)
--- a/
udev.h
+++ b/
udev.h
@@
-31,9
+31,13
@@
#define COMMENT_CHARACTER '#'
#define LINE_SIZE 512
#define PATH_SIZE 512
#define COMMENT_CHARACTER '#'
#define LINE_SIZE 512
#define PATH_SIZE 512
-#define NAME_SIZE
128
+#define NAME_SIZE
256
#define VALUE_SIZE 128
#define VALUE_SIZE 128
+#define ALLOWED_CHARS "#+-.:=@_"
+#define ALLOWED_CHARS_FILE ALLOWED_CHARS "/"
+#define ALLOWED_CHARS_INPUT ALLOWED_CHARS_FILE " $%?,"
+
#define DEFAULT_PARTITIONS_COUNT 15
#define UDEV_ALARM_TIMEOUT 180
#define DEFAULT_PARTITIONS_COUNT 15
#define UDEV_ALARM_TIMEOUT 180
@@
-44,6
+48,7
@@
#define WRITE_END 1
#define DB_DIR ".udev/db"
#define WRITE_END 1
#define DB_DIR ".udev/db"
+#define DB_NAME_INDEX_DIR ".udev/names"
struct udev_rules;
struct udev_rules;
@@
-85,6
+90,7
@@
struct udevice {
int ignore_device;
int ignore_remove;
char program_result[PATH_SIZE];
int ignore_device;
int ignore_remove;
char program_result[PATH_SIZE];
+ int link_priority;
int test_run;
};
int test_run;
};
@@
-97,7
+103,7
@@
extern int udev_run;
extern void udev_config_init(void);
/* udev_device.c */
extern void udev_config_init(void);
/* udev_device.c */
-extern struct udevice *udev_device_init(
void
);
+extern struct udevice *udev_device_init(
struct udevice *udev
);
extern void udev_device_cleanup(struct udevice *udev);
extern int udev_device_event(struct udev_rules *rules, struct udevice *udev);
extern dev_t udev_device_get_devt(struct udevice *udev);
extern void udev_device_cleanup(struct udevice *udev);
extern int udev_device_event(struct udev_rules *rules, struct udevice *udev);
extern dev_t udev_device_get_devt(struct udevice *udev);
@@
-113,28
+119,32
@@
extern struct sysfs_device *sysfs_device_get_parent(struct sysfs_device *dev);
extern struct sysfs_device *sysfs_device_get_parent_with_subsystem(struct sysfs_device *dev, const char *subsystem);
extern char *sysfs_attr_get_value(const char *devpath, const char *attr_name);
extern int sysfs_resolve_link(char *path, size_t size);
extern struct sysfs_device *sysfs_device_get_parent_with_subsystem(struct sysfs_device *dev, const char *subsystem);
extern char *sysfs_attr_get_value(const char *devpath, const char *attr_name);
extern int sysfs_resolve_link(char *path, size_t size);
+extern int sysfs_lookup_devpath_by_subsys_id(char *devpath, size_t len, const char *subsystem, const char *id);
/* udev_node.c */
extern int udev_node_mknod(struct udevice *udev, const char *file, dev_t devt, mode_t mode, uid_t uid, gid_t gid);
/* udev_node.c */
extern int udev_node_mknod(struct udevice *udev, const char *file, dev_t devt, mode_t mode, uid_t uid, gid_t gid);
-extern
int udev_node_add
(struct udevice *udev, struct udevice *udev_old);
-extern
void udev_node_remove_symlinks
(struct udevice *udev);
+extern
void udev_node_update_symlinks
(struct udevice *udev, struct udevice *udev_old);
+extern
int udev_node_add
(struct udevice *udev);
extern int udev_node_remove(struct udevice *udev);
/* udev_db.c */
extern int udev_db_add_device(struct udevice *dev);
extern int udev_db_delete_device(struct udevice *dev);
extern int udev_db_get_device(struct udevice *udev, const char *devpath);
extern int udev_node_remove(struct udevice *udev);
/* udev_db.c */
extern int udev_db_add_device(struct udevice *dev);
extern int udev_db_delete_device(struct udevice *dev);
extern int udev_db_get_device(struct udevice *udev, const char *devpath);
-extern int udev_db_
lookup_name(const char *name, char *devpath, size_t len
);
+extern int udev_db_
get_devices_by_name(const char *name, struct list_head *name_list
);
extern int udev_db_get_all_entries(struct list_head *name_list);
/* udev_utils.c */
struct name_entry {
struct list_head node;
char name[PATH_SIZE];
extern int udev_db_get_all_entries(struct list_head *name_list);
/* udev_utils.c */
struct name_entry {
struct list_head node;
char name[PATH_SIZE];
+ unsigned int ignore_error:1;
};
};
+
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, int sort);
-extern char *name_list_key_add(struct list_head *name_list, const char *key, const char *value);
+extern struct name_entry *name_list_add(struct list_head *name_list, const char *name, int sort);
+extern struct name_entry *name_list_key_add(struct list_head *name_list, const char *key, const char *value);
+extern int name_list_key_remove(struct list_head *name_list, const char *key);
extern void name_list_cleanup(struct list_head *name_list);
extern int add_matching_files(struct list_head *name_list, const char *dirname, const char *suffix);
extern uid_t lookup_user(const char *user);
extern void name_list_cleanup(struct list_head *name_list);
extern int add_matching_files(struct list_head *name_list, const char *dirname, const char *suffix);
extern uid_t lookup_user(const char *user);
@@
-146,7
+156,7
@@
extern void remove_trailing_chars(char *path, char c);
extern size_t path_encode(char *s, size_t len);
extern size_t path_decode(char *s);
extern int utf8_encoded_valid_unichar(const char *str);
extern size_t path_encode(char *s, size_t len);
extern size_t path_decode(char *s);
extern int utf8_encoded_valid_unichar(const char *str);
-extern int replace_
untrusted_chars(char *str
);
+extern int replace_
chars(char *str, const char *white
);
/* udev_utils_file.c */
extern int create_path(const char *path);
/* udev_utils_file.c */
extern int create_path(const char *path);
@@
-156,9
+166,4
@@
extern void file_unmap(void *buf, size_t bufsize);
extern int unlink_secure(const char *filename);
extern size_t buf_get_line(const char *buf, size_t buflen, size_t cur);
extern int unlink_secure(const char *filename);
extern size_t buf_get_line(const char *buf, size_t buflen, size_t cur);
-/* udev_utils_run.c */
-extern int pass_env_to_socket(const char *name, const char *devpath, const char *action);
-extern int run_program(const char *command, const char *subsystem,
- char *result, size_t ressize, size_t *reslen, int log);
-
#endif
#endif