add util_resolve_subsys_kernel()

[elogind.git] / udev / udev.h

diff --git a/udev/udev.h b/udev/udev.h
index d0ffb6cb3119f9fe9d8c4aab3feb34e4bb0f25b4..217e942c18fddb05f806b1ef79df11fb7b7df6bb 100644 (file)
--- a/udev/udev.h
+++ b/udev/udev.h
@@ -33,10 +33,6 @@
 #define DEFAULT_FAKE_PARTITIONS_COUNT          15
 #define UDEV_EVENT_TIMEOUT                     180
 
-/* linux/include/linux/kobject.h */
-#define UEVENT_BUFFER_SIZE                     2048
-#define UEVENT_NUM_ENVP                                32
-
 #define UDEV_CTRL_SOCK_PATH                    "@" UDEV_PREFIX "/org/kernel/udev/udevd"
 
 #define UDEV_MAX(a,b) ((a) > (b) ? (a) : (b))
@@ -60,7 +56,6 @@ static inline void logging_close(void)
        closelog();
 }
 
-/* udev-event.c */
 struct udev_event {
        struct udev *udev;
        struct udev_device *dev;
@@ -86,18 +81,22 @@ struct udev_event {
        int exitstatus;
        time_t queue_time;
 };
-struct udev_rules;
-extern struct udev_event *udev_event_new(struct udev_device *dev);
-extern void udev_event_unref(struct udev_event *event);
-extern int udev_event_execute_rules(struct udev_event *event, struct udev_rules *rules);
 
 /* udev-rules.c */
+struct udev_rules;
 extern struct udev_rules *udev_rules_new(struct udev *udev, int resolve_names);
 extern void udev_rules_unref(struct udev_rules *rules);
 extern int udev_rules_get_name(struct udev_rules *rules, struct udev_event *event);
 extern int udev_rules_get_run(struct udev_rules *rules, struct udev_event *event);
-extern int udev_rules_run(struct udev_event *event);
-extern void udev_rules_apply_format(struct udev_event *event, char *string, size_t maxsize);
+
+/* udev-event.c */
+extern struct udev_event *udev_event_new(struct udev_device *dev);
+extern void udev_event_unref(struct udev_event *event);
+extern int udev_event_execute_rules(struct udev_event *event, struct udev_rules *rules);
+extern int udev_event_execute_run(struct udev_event *event);
+extern void udev_event_apply_format(struct udev_event *event, char *string, size_t maxsize);
+extern int udev_event_apply_subsys_kernel(struct udev_event *event, const char *string,
+                                         char *result, size_t maxsize, int read_value);
 
 /* udev-node.c */
 extern int udev_node_mknod(struct udev_device *dev, const char *file, dev_t devnum, mode_t mode, uid_t uid, gid_t gid);
@@ -106,29 +105,26 @@ extern int udev_node_remove(struct udev_device *dev, int test);
 extern void udev_node_update_old_links(struct udev_device *dev, struct udev_device *dev_old, int test);
 
 /* udev-util.c */
-extern int create_path(struct udev *udev, const char *path);
-extern int delete_path(struct udev *udev, const char *path);
-extern int unlink_secure(struct udev *udev, const char *filename);
-extern uid_t lookup_user(struct udev *udev, const char *user);
-extern gid_t lookup_group(struct udev *udev, const char *group);
-extern int run_program(struct udev *udev, const char *command, char **envp,
-                      char *result, size_t ressize, size_t *reslen);
-
-/* udev_utils_file.c */
-extern int file_map(const char *filename, char **buf, size_t *bufsize);
-extern void file_unmap(void *buf, size_t bufsize);
-extern size_t buf_get_line(const char *buf, size_t buflen, size_t cur);
+extern int util_create_path(struct udev *udev, const char *path);
+extern int util_delete_path(struct udev *udev, const char *path);
+extern int util_unlink_secure(struct udev *udev, const char *filename);
+extern uid_t util_lookup_user(struct udev *udev, const char *user);
+extern gid_t util_lookup_group(struct udev *udev, const char *group);
+extern int util_run_program(struct udev *udev, const char *command, char **envp,
+                           char *result, size_t ressize, size_t *reslen);
+extern int util_resolve_subsys_kernel(struct udev *udev, const char *string,
+                                     char *result, size_t maxsize, int read_value);
 
 /* udev-selinux.c */
 #ifndef USE_SELINUX
-static inline void selinux_init(struct udev *udev) {}
-static inline void selinux_exit(struct udev *udev) {}
+static inline void udev_selinux_init(struct udev *udev) {}
+static inline void udev_selinux_exit(struct udev *udev) {}
 static inline void udev_selinux_lsetfilecon(struct udev *udev, const char *file, unsigned int mode) {}
 static inline void udev_selinux_setfscreatecon(struct udev *udev, const char *file, unsigned int mode) {}
 static inline void udev_selinux_resetfscreatecon(struct udev *udev) {}
 #else
-extern void selinux_init(struct udev *udev);
-extern void selinux_exit(struct udev *udev);
+extern void udev_selinux_init(struct udev *udev);
+extern void udev_selinux_exit(struct udev *udev);
 extern void udev_selinux_lsetfilecon(struct udev *udev, const char *file, unsigned int mode);
 extern void udev_selinux_setfscreatecon(struct udev *udev, const char *file, unsigned int mode);
 extern void udev_selinux_resetfscreatecon(struct udev *udev);