Docs: udev.xml: Clarify through a change in word ordering

[elogind.git] / udev / udev.h

diff --git a/udev/udev.h b/udev/udev.h
index 8926dee9326ed02af990de107da1cde6e964ef95..6833e60d616e4037f54b5037725f3ecee805143f 100644 (file)
--- a/udev/udev.h
+++ b/udev/udev.h
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2003 Greg Kroah-Hartman <greg@kroah.com>
- * Copyright (C) 2003-2008 Kay Sievers <kay.sievers@vrfy.org>
+ * Copyright (C) 2003-2010 Kay Sievers <kay.sievers@vrfy.org>
  *
  * 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
@@ -21,6 +21,7 @@
 
 #include <sys/types.h>
 #include <sys/param.h>
+#include <signal.h>
 
 #include "libudev.h"
 #include "libudev-private.h"
@@ -28,33 +29,13 @@
 #define DEFAULT_FAKE_PARTITIONS_COUNT          15
 #define UDEV_EVENT_TIMEOUT                     180
 
-#define UDEV_CTRL_SOCK_PATH                    "@" UDEV_PREFIX "/org/kernel/udev/udevd"
-
-#define UDEV_MAX(a,b) ((a) > (b) ? (a) : (b))
-#define READ_END                               0
-#define WRITE_END                              1
-
-static inline void logging_init(const char *program_name)
-{
-       openlog(program_name, LOG_PID | LOG_CONS, LOG_DAEMON);
-}
-
-static inline void logging_msg(struct udev *udev, int priority,
-                         const char *file, int line, const char *fn,
-                         const char *format, va_list args)
-{
-       vsyslog(priority, format, args);
-}
-
-static inline void logging_close(void)
-{
-       closelog();
-}
+#define UDEV_CTRL_SOCK_PATH                    "@/org/kernel/udev/udevd"
 
 struct udev_event {
        struct udev *udev;
        struct udev_device *dev;
        struct udev_device *dev_parent;
+       struct udev_device *dev_db;
        char *name;
        char *tmp_node;
        char *program_result;
@@ -62,14 +43,15 @@ struct udev_event {
        uid_t uid;
        gid_t gid;
        struct udev_list_node run_list;
-       unsigned int group_final:1;
-       unsigned int owner_final:1;
-       unsigned int mode_final:1;
-       unsigned int name_final:1;
-       unsigned int devlink_final:1;
-       unsigned int run_final:1;
-       unsigned int ignore_device:1;
-       unsigned int inotify_watch:1;
+       int exec_delay;
+       bool inotify_watch;
+       bool inotify_watch_final;
+       bool group_final;
+       bool owner_final;
+       bool mode_final;
+       bool name_final;
+       bool devlink_final;
+       bool run_final;
 };
 
 struct udev_watch {
@@ -83,12 +65,13 @@ struct udev_rules;
 struct udev_rules *udev_rules_new(struct udev *udev, int resolve_names);
 void udev_rules_unref(struct udev_rules *rules);
 int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event);
+void udev_rules_apply_static_dev_perms(struct udev_rules *rules);
 
 /* udev-event.c */
 struct udev_event *udev_event_new(struct udev_device *dev);
 void udev_event_unref(struct udev_event *event);
 int udev_event_execute_rules(struct udev_event *event, struct udev_rules *rules);
-int udev_event_execute_run(struct udev_event *event);
+int udev_event_execute_run(struct udev_event *event, const sigset_t *sigset);
 size_t udev_event_apply_format(struct udev_event *event, const char *src, char *dest, size_t size);
 int udev_event_apply_subsys_kernel(struct udev_event *event, const char *string,
                                   char *result, size_t maxsize, int read_value);
@@ -101,37 +84,11 @@ void udev_watch_end(struct udev *udev, struct udev_device *dev);
 struct udev_device *udev_watch_lookup(struct udev *udev, int wd);
 
 /* udev-node.c */
-int udev_node_mknod(struct udev_device *dev, const char *file, dev_t devnum, mode_t mode, uid_t uid, gid_t gid);
+int udev_node_mknod(struct udev_device *dev, const char *file, mode_t mode, uid_t uid, gid_t gid);
 int udev_node_add(struct udev_device *dev, mode_t mode, uid_t uid, gid_t gid);
 int udev_node_remove(struct udev_device *dev);
 void udev_node_update_old_links(struct udev_device *dev, struct udev_device *dev_old);
 
-/* udev-util.c */
-int util_create_path(struct udev *udev, const char *path);
-int util_delete_path(struct udev *udev, const char *path);
-int util_unlink_secure(struct udev *udev, const char *filename);
-uid_t util_lookup_user(struct udev *udev, const char *user);
-gid_t util_lookup_group(struct udev *udev, const char *group);
-int util_run_program(struct udev *udev, const char *command, char **envp,
-                    char *result, size_t ressize, size_t *reslen);
-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 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
-void udev_selinux_init(struct udev *udev);
-void udev_selinux_exit(struct udev *udev);
-void udev_selinux_lsetfilecon(struct udev *udev, const char *file, unsigned int mode);
-void udev_selinux_setfscreatecon(struct udev *udev, const char *file, unsigned int mode);
-void udev_selinux_resetfscreatecon(struct udev *udev);
-#endif
-
 /* udevadm commands */
 int udevadm_monitor(struct udev *udev, int argc, char *argv[]);
 int udevadm_info(struct udev *udev, int argc, char *argv[]);