hwdb: add --lookup-prefix= option

[elogind.git] / src / udev / udev.h

diff --git a/src/udev/udev.h b/src/udev/udev.h
index 63de30c02d62b810c373eeafaa5b448ef76060f3..4f10c452e65cc6bb14997c45dce9d30d0266a5b3 100644 (file)
--- a/src/udev/udev.h
+++ b/src/udev/udev.h
@@ -16,13 +16,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 

-#ifndef _UDEV_H_
-#define _UDEV_H_
+#pragma once

 
 #include <sys/types.h>
 #include <sys/param.h>
 #include <signal.h>
 
 
 #include <sys/types.h>
 #include <sys/param.h>
 #include <signal.h>
 

+#include "macro.h"

 #include "libudev.h"
 #include "libudev-private.h"
 #include "util.h"
 #include "libudev.h"
 #include "libudev-private.h"
 #include "util.h"


@@ -49,7 +49,9 @@ struct udev_event {
         bool sigterm;
         bool inotify_watch;
         bool inotify_watch_final;
         bool sigterm;
         bool inotify_watch;
         bool inotify_watch_final;

+        bool group_set;

         bool group_final;
         bool group_final;

+        bool owner_set;

         bool owner_final;
         bool mode_set;
         bool mode_final;
         bool owner_final;
         bool mode_set;
         bool mode_final;


@@ -93,7 +95,7 @@ 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 */
 struct udev_device *udev_watch_lookup(struct udev *udev, int wd);
 
 /* udev-node.c */

-void udev_node_add(struct udev_device *dev, mode_t mode, uid_t uid, gid_t gid);
+void udev_node_add(struct udev_device *dev, bool apply, mode_t mode, uid_t uid, gid_t gid);

 void udev_node_remove(struct udev_device *dev);
 void udev_node_update_old_links(struct udev_device *dev, struct udev_device *dev_old);
 
 void udev_node_remove(struct udev_device *dev);
 void udev_node_update_old_links(struct udev_device *dev, struct udev_device *dev_old);
 


@@ -138,10 +140,14 @@ enum udev_builtin_cmd {
         UDEV_BUILTIN_BLKID,
 #endif
         UDEV_BUILTIN_BTRFS,
         UDEV_BUILTIN_BLKID,
 #endif
         UDEV_BUILTIN_BTRFS,

+#ifdef HAVE_FIRMWARE

         UDEV_BUILTIN_FIRMWARE,
         UDEV_BUILTIN_FIRMWARE,

+#endif

         UDEV_BUILTIN_HWDB,
         UDEV_BUILTIN_INPUT_ID,
         UDEV_BUILTIN_HWDB,
         UDEV_BUILTIN_INPUT_ID,

+#ifdef HAVE_KMOD

         UDEV_BUILTIN_KMOD,
         UDEV_BUILTIN_KMOD,

+#endif

         UDEV_BUILTIN_NET_ID,
         UDEV_BUILTIN_PATH_ID,
         UDEV_BUILTIN_USB_ID,
         UDEV_BUILTIN_NET_ID,
         UDEV_BUILTIN_PATH_ID,
         UDEV_BUILTIN_USB_ID,


@@ -163,10 +169,14 @@ struct udev_builtin {
 extern const struct udev_builtin udev_builtin_blkid;
 #endif
 extern const struct udev_builtin udev_builtin_btrfs;
 extern const struct udev_builtin udev_builtin_blkid;
 #endif
 extern const struct udev_builtin udev_builtin_btrfs;

+#ifdef HAVE_FIRMWARE

 extern const struct udev_builtin udev_builtin_firmware;
 extern const struct udev_builtin udev_builtin_firmware;

+#endif

 extern const struct udev_builtin udev_builtin_hwdb;
 extern const struct udev_builtin udev_builtin_input_id;
 extern const struct udev_builtin udev_builtin_hwdb;
 extern const struct udev_builtin udev_builtin_input_id;

+#ifdef HAVE_KMOD

 extern const struct udev_builtin udev_builtin_kmod;
 extern const struct udev_builtin udev_builtin_kmod;

+#endif

 extern const struct udev_builtin udev_builtin_net_id;
 extern const struct udev_builtin udev_builtin_path_id;
 extern const struct udev_builtin udev_builtin_usb_id;
 extern const struct udev_builtin udev_builtin_net_id;
 extern const struct udev_builtin udev_builtin_path_id;
 extern const struct udev_builtin udev_builtin_usb_id;


@@ -180,12 +190,13 @@ int udev_builtin_run(struct udev_device *dev, enum udev_builtin_cmd cmd, const c
 void udev_builtin_list(struct udev *udev);
 bool udev_builtin_validate(struct udev *udev);
 int udev_builtin_add_property(struct udev_device *dev, bool test, const char *key, const char *val);
 void udev_builtin_list(struct udev *udev);
 bool udev_builtin_validate(struct udev *udev);
 int udev_builtin_add_property(struct udev_device *dev, bool test, const char *key, const char *val);

-int udev_builtin_hwdb_lookup(struct udev_device *dev, const char *modalias, bool test);
+int udev_builtin_hwdb_lookup(struct udev_device *dev, const char *prefix, const char *modalias,
+                             const char *filter, bool test);

 
 /* udev logging */
 void udev_main_log(struct udev *udev, int priority,
                    const char *file, int line, const char *fn,
 
 /* udev logging */
 void udev_main_log(struct udev *udev, int priority,
                    const char *file, int line, const char *fn,

-                   const char *format, va_list args);
+                   const char *format, va_list args) _printf_attr_(6, 0);

 
 /* udevadm commands */
 struct udevadm_cmd {
 
 /* udevadm commands */
 struct udevadm_cmd {


@@ -202,4 +213,3 @@ extern const struct udevadm_cmd udevadm_monitor;
 extern const struct udevadm_cmd udevadm_hwdb;
 extern const struct udevadm_cmd udevadm_test;
 extern const struct udevadm_cmd udevadm_test_builtin;
 extern const struct udevadm_cmd udevadm_hwdb;
 extern const struct udevadm_cmd udevadm_test;
 extern const struct udevadm_cmd udevadm_test_builtin;

-#endif