X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev%2Flib%2Flibudev.h;h=4d5fd93efc0cc3430854b2bcc3d6f018ffe3aad8;hp=cd366c7dfca81692abed23551094dda12227a432;hb=4c9dff47f696b1e6c89cc6e0a7ba683067927821;hpb=a689165b5a140cd7d5fdd63cacf8fce2f275033d

diff --git a/udev/lib/libudev.h b/udev/lib/libudev.h
index cd366c7df..4d5fd93ef 100644
--- a/udev/lib/libudev.h
+++ b/udev/lib/libudev.h
@@ -20,15 +20,15 @@
 #ifndef _LIBUDEV_H_
 #define _LIBUDEV_H_
 
+#include <stdarg.h>
+#include <sys/stat.h>
+
 /* this will stay as long as the DeviceKit integration of udev is work in progress */
-#if !defined LIBUDEV_COMPILATION && !defined LIBUDEV_I_KNOW_THE_API_IS_SUBJECT_TO_CHANGE
+#if !defined _LIBUDEV_COMPILATION && !defined LIBUDEV_I_KNOW_THE_API_IS_SUBJECT_TO_CHANGE
 #error "#define LIBUDEV_I_KNOW_THE_API_IS_SUBJECT_TO_CHANGE is needed to use this experimental library version"
 #endif
 
 struct udev;
-struct udev_device;
-struct udev_monitor;
-
 extern struct udev *udev_new(void);
 extern struct udev *udev_ref(struct udev *udev);
 extern void udev_unref(struct udev *udev);
@@ -36,16 +36,26 @@ extern void udev_set_log_fn(struct udev *udev,
 			    void (*log_fn)(struct udev *udev,
 					   int priority, const char *file, int line, const char *fn,
 					   const char *format, va_list args));
+extern int udev_get_log_priority(struct udev *udev);
+extern void udev_set_log_priority(struct udev *udev, int priority);
 extern const char *udev_get_sys_path(struct udev *udev);
 extern const char *udev_get_dev_path(struct udev *udev);
+extern void udev_selinux_resetfscreatecon(struct udev *udev);
+extern void udev_selinux_setfscreatecon(struct udev *udev, const char *file, unsigned int mode);
+extern void udev_selinux_lsetfilecon(struct udev *udev, const char *file, unsigned int mode);
 
-extern struct udev_device *udev_device_new_from_devpath(struct udev *udev, const char *devpath);
+struct udev_device;
+extern struct udev_device *udev_device_new_from_syspath(struct udev *udev, const char *syspath);
+extern struct udev_device *udev_device_new_from_devnum(struct udev *udev, char type, dev_t devnum);
+extern struct udev_device *udev_device_get_parent(struct udev_device *udev_device);
 extern struct udev_device *udev_device_ref(struct udev_device *udev_device);
 extern void udev_device_unref(struct udev_device *udev_device);
 extern struct udev *udev_device_get_udev(struct udev_device *udev_device);
 extern const char *udev_device_get_devpath(struct udev_device *udev_device);
-extern const char *udev_device_get_devname(struct udev_device *udev_device);
 extern const char *udev_device_get_subsystem(struct udev_device *udev_device);
+extern const char *udev_device_get_syspath(struct udev_device *udev_device);
+extern const char *udev_device_get_sysname(struct udev_device *udev_device);
+extern const char *udev_device_get_devnode(struct udev_device *udev_device);
 extern int udev_device_get_devlinks(struct udev_device *udev_device,
 				    int (*cb)(struct udev_device *udev_device,
 					      const char *value, void *data),
@@ -54,17 +64,24 @@ extern int udev_device_get_properties(struct udev_device *udev_device,
 				      int (*cb)(struct udev_device *udev_device,
 						const char *key, const char *value, void *data),
 				      void *data);
+extern const char *udev_device_get_driver(struct udev_device *udev_device);
+extern dev_t udev_device_get_devnum(struct udev_device *udev_device);
+extern const char *udev_device_get_action(struct udev_device *udev_device);
+extern unsigned long long int udev_device_get_seqnum(struct udev_device *udev_device);
+extern const char *udev_device_get_attr_value(struct udev_device *udev_device, const char *attr);
 
-extern int udev_devices_enumerate(struct udev *udev, const char *subsystem,
-				  int (*cb)(struct udev *udev,
-					    const char *devpath, const char *subsystem, const char *name, void *data),
+extern int udev_enumerate_devices(struct udev *udev, const char *subsystem,
+				  int (*cb)(struct udev_device *udev_device, void *data),
 				  void *data);
 
+struct udev_monitor;
 extern struct udev_monitor *udev_monitor_new_from_socket(struct udev *udev, const char *socket_path);
+extern struct udev_monitor *udev_monitor_new_from_netlink(struct udev *udev);
+extern int udev_monitor_enable_receiving(struct udev_monitor *udev_monitor);
 extern struct udev_monitor *udev_monitor_ref(struct udev_monitor *udev_monitor);
 extern void udev_monitor_unref(struct udev_monitor *udev_monitor);
 extern struct udev *udev_monitor_get_udev(struct udev_monitor *udev_monitor);
 extern int udev_monitor_get_fd(struct udev_monitor *udev_monitor);
-extern struct udev_device *udev_monitor_get_device(struct udev_monitor *udev_monitor);
+extern struct udev_device *udev_monitor_receive_device(struct udev_monitor *udev_monitor);
 
 #endif