X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev%2Flib%2Flibudev-private.h;h=0756efea811a6336c8aec9f8825b9dd5266d50bd;hp=5be798317d2f9afbe0f6912536838c4aed5596f6;hb=19d7e87cc0ef364fb13a18411cb165b2427b3529;hpb=9921484458e0233e1aae868bfa8cc1481aa460a8

diff --git a/udev/lib/libudev-private.h b/udev/lib/libudev-private.h
index 5be798317..0756efea8 100644
--- a/udev/lib/libudev-private.h
+++ b/udev/lib/libudev-private.h
@@ -3,18 +3,10 @@
  *
  * Copyright (C) 2008 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
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  */
 
 #ifndef _LIBUDEV_PRIVATE_H_
@@ -22,25 +14,24 @@
 
 #include <syslog.h>
 #include "libudev.h"
-#include "list.h"
 
-#ifdef USE_LOG
-#ifdef USE_DEBUG
-#define dbg(udev, arg...) \
-	udev_log(udev, LOG_DEBUG, __FILE__, __LINE__, __FUNCTION__, ## arg)
-#else
-#define dbg(format, arg...) do { } while (0)
-#endif /* USE_DEBUG */
+#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
 
-#define info(udev, arg...) \
-	udev_log(udev, LOG_INFO, __FILE__, __LINE__, __FUNCTION__, ## arg)
+static inline void __attribute__ ((format(printf, 2, 3)))
+udev_log_null(struct udev *udev, const char *format, ...) {}
 
-#define err(udev, arg...) \
-	udev_log(udev, LOG_ERR, __FILE__, __LINE__, __FUNCTION__, ## arg)
+#ifdef USE_LOG
+#  ifdef DEBUG
+#    define dbg(udev, arg...) udev_log(udev, LOG_DEBUG, __FILE__, __LINE__, __FUNCTION__, ## arg)
+#  else
+#    define dbg(udev, arg...) udev_log_null(udev, ## arg)
+#  endif
+#  define info(udev, arg...) udev_log(udev, LOG_INFO, __FILE__, __LINE__, __FUNCTION__, ## arg)
+#  define err(udev, arg...) udev_log(udev, LOG_ERR, __FILE__, __LINE__, __FUNCTION__, ## arg)
 #else
-#define dbg(format, arg...) do { } while (0)
-#define info(format, arg...) do { } while (0)
-#define err(format, arg...) do { } while (0)
+#  define dbg(udev, arg...) udev_log_null(udev, ## arg)
+#  define info(udev, arg...) udev_log_null(udev, ## arg)
+#  define err(udev, arg...) udev_log_null(udev, ## arg)
 #endif
 
 /* libudev */
@@ -48,36 +39,55 @@ void udev_log(struct udev *udev,
 	      int priority, const char *file, int line, const char *fn,
 	      const char *format, ...)
 	      __attribute__ ((format(printf, 6, 7)));
-extern struct udev_device *device_init(struct udev *udev);
+extern struct udev_device *device_new(struct udev *udev);
 extern const char *udev_get_rules_path(struct udev *udev);
 extern int udev_get_run(struct udev *udev);
+extern struct udev_list_entry *udev_add_property(struct udev *udev, const char *key, const char *value);
+extern struct udev_list_entry *udev_get_properties_list_entry(struct udev *udev);
 
 /* libudev-device */
-extern int device_set_syspath(struct udev_device *udev_device, const char *syspath);
-extern int device_set_subsystem(struct udev_device *udev_device, const char *subsystem);
-extern int device_set_devnode(struct udev_device *udev_device, const char *devnode);
-extern int device_add_devlink(struct udev_device *udev_device, const char *devlink);
-extern int device_add_property(struct udev_device *udev_device, const char *key, const char *value);
-extern int device_add_property_from_string(struct udev_device *udev_device, const char *property);
-extern int device_set_action(struct udev_device *udev_device, const char *action);
-extern int device_set_driver(struct udev_device *udev_device, const char *driver);
-extern const char *device_get_devpath_old(struct udev_device *udev_device);
-extern int device_set_devpath_old(struct udev_device *udev_device, const char *devpath_old);
-extern const char *device_get_physdevpath(struct udev_device *udev_device);
-extern int device_set_physdevpath(struct udev_device *udev_device, const char *physdevpath);
-extern int device_get_timeout(struct udev_device *udev_device);
-extern int device_set_timeout(struct udev_device *udev_device, int timeout);
-extern int device_get_event_timeout(struct udev_device *udev_device);
-extern int device_set_event_timeout(struct udev_device *udev_device, int event_timeout);
-extern int device_set_devnum(struct udev_device *udev_device, dev_t devnum);
-extern int device_set_seqnum(struct udev_device *udev_device, unsigned long long int seqnum);
-extern int device_get_num_fake_partitions(struct udev_device *udev_device);
-extern int device_set_num_fake_partitions(struct udev_device *udev_device, int num);
-extern int device_get_devlink_priority(struct udev_device *udev_device);
-extern int device_set_devlink_priority(struct udev_device *udev_device, int prio);
-extern int device_get_ignore_remove(struct udev_device *udev_device);
-extern int device_set_ignore_remove(struct udev_device *udev_device, int ignore);
-extern void device_set_info_loaded(struct udev_device *device);
+extern int udev_device_set_syspath(struct udev_device *udev_device, const char *syspath);
+extern int udev_device_set_subsystem(struct udev_device *udev_device, const char *subsystem);
+extern int udev_device_set_devtype(struct udev_device *udev_device, const char *devtype);
+extern int udev_device_set_devnode(struct udev_device *udev_device, const char *devnode);
+extern int udev_device_add_devlink(struct udev_device *udev_device, const char *devlink);
+extern void udev_device_cleanup_devlinks_list(struct udev_device *udev_device);
+extern struct udev_list_entry *udev_device_add_property(struct udev_device *udev_device, const char *key, const char *value);
+extern struct udev_list_entry *udev_device_add_property_from_string(struct udev_device *udev_device, const char *property);
+extern char **udev_device_get_properties_envp(struct udev_device *udev_device);
+extern ssize_t udev_device_get_properties_monitor_buf(struct udev_device *udev_device, const char **buf);
+extern int udev_device_read_db(struct udev_device *udev_device);
+extern int udev_device_read_uevent_file(struct udev_device *udev_device);
+extern int udev_device_set_action(struct udev_device *udev_device, const char *action);
+extern int udev_device_set_driver(struct udev_device *udev_device, const char *driver);
+extern const char *udev_device_get_devpath_old(struct udev_device *udev_device);
+extern int udev_device_set_devpath_old(struct udev_device *udev_device, const char *devpath_old);
+extern const char *udev_device_get_physdevpath(struct udev_device *udev_device);
+extern int udev_device_set_physdevpath(struct udev_device *udev_device, const char *physdevpath);
+extern int udev_device_get_timeout(struct udev_device *udev_device);
+extern int udev_device_set_timeout(struct udev_device *udev_device, int timeout);
+extern int udev_device_get_event_timeout(struct udev_device *udev_device);
+extern int udev_device_set_event_timeout(struct udev_device *udev_device, int event_timeout);
+extern int udev_device_set_devnum(struct udev_device *udev_device, dev_t devnum);
+extern int udev_device_set_seqnum(struct udev_device *udev_device, unsigned long long int seqnum);
+extern int udev_device_get_num_fake_partitions(struct udev_device *udev_device);
+extern int udev_device_set_num_fake_partitions(struct udev_device *udev_device, int num);
+extern int udev_device_get_devlink_priority(struct udev_device *udev_device);
+extern int udev_device_set_devlink_priority(struct udev_device *udev_device, int prio);
+extern int udev_device_get_ignore_remove(struct udev_device *udev_device);
+extern int udev_device_set_ignore_remove(struct udev_device *udev_device, int ignore);
+extern int udev_device_get_watch_handle(struct udev_device *udev_device);
+extern int udev_device_set_watch_handle(struct udev_device *udev_device, int handle);
+extern void udev_device_set_info_loaded(struct udev_device *device);
+
+/* libudev-device-db-write.c */
+extern int udev_device_update_db(struct udev_device *udev_device);
+extern int udev_device_delete_db(struct udev_device *udev_device);
+extern int udev_device_rename_db(struct udev_device *udev_device, const char *devpath);
+
+/* libudev-monitor - netlink/unix socket communication  */
+extern int udev_monitor_send_device(struct udev_monitor *udev_monitor, struct udev_device *udev_device);
+extern int udev_monitor_set_receive_buffer_size(struct udev_monitor *udev_monitor, int size);
 
 /* libudev-ctrl - daemon runtime setup */
 struct udev_ctrl;
@@ -91,6 +101,7 @@ extern int udev_ctrl_send_set_log_level(struct udev_ctrl *uctrl, int priority);
 extern int udev_ctrl_send_stop_exec_queue(struct udev_ctrl *uctrl);
 extern int udev_ctrl_send_start_exec_queue(struct udev_ctrl *uctrl);
 extern int udev_ctrl_send_reload_rules(struct udev_ctrl *uctrl);
+extern int udev_ctrl_send_settle(struct udev_ctrl *uctrl);
 extern int udev_ctrl_send_set_env(struct udev_ctrl *uctrl, const char *key);
 extern int udev_ctrl_send_set_max_childs(struct udev_ctrl *uctrl, int count);
 struct udev_ctrl_msg;
@@ -102,26 +113,53 @@ extern int udev_ctrl_get_set_log_level(struct udev_ctrl_msg *ctrl_msg);
 extern int udev_ctrl_get_stop_exec_queue(struct udev_ctrl_msg *ctrl_msg);
 extern int udev_ctrl_get_start_exec_queue(struct udev_ctrl_msg *ctrl_msg);
 extern int udev_ctrl_get_reload_rules(struct udev_ctrl_msg *ctrl_msg);
+extern pid_t udev_ctrl_get_settle(struct udev_ctrl_msg *ctrl_msg);
 extern const char *udev_ctrl_get_set_env(struct udev_ctrl_msg *ctrl_msg);
 extern int udev_ctrl_get_set_max_childs(struct udev_ctrl_msg *ctrl_msg);
 
 /* libudev-list */
-extern struct udev_list *list_insert(struct udev *udev, struct list_head *name_list,
-				     const char *name, const char *value, int sort);
-extern struct udev_list *list_get_entry(struct list_head *list);
-extern void list_move_to_end(struct udev_list *list_entry, struct list_head *list);
-extern void list_cleanup(struct udev *udev, struct list_head *name_list);
+struct udev_list_node {
+	struct udev_list_node *next, *prev;
+};
+extern void udev_list_init(struct udev_list_node *list);
+extern int udev_list_is_empty(struct udev_list_node *list);
+extern void udev_list_node_append(struct udev_list_node *new, struct udev_list_node *list);
+extern void udev_list_node_remove(struct udev_list_node *entry);
+#define udev_list_node_foreach(node, list) \
+	for (node = (list)->next; \
+	     node != list; \
+	     node = (node)->next)
+#define udev_list_node_foreach_safe(node, tmp, list) \
+	for (node = (list)->next, tmp = (node)->next; \
+	     node != list; \
+	     node = tmp, tmp = (tmp)->next)
+extern struct udev_list_entry *udev_list_entry_add(struct udev *udev, struct udev_list_node *list,
+						   const char *name, const char *value,
+						   int unique, int sort);
+extern void udev_list_entry_delete(struct udev_list_entry *entry);
+extern void udev_list_entry_remove(struct udev_list_entry *entry);
+extern void udev_list_entry_insert_before(struct udev_list_entry *new, struct udev_list_entry *entry);
+extern void udev_list_entry_append(struct udev_list_entry *new, struct udev_list_node *list);
+extern void udev_list_cleanup_entries(struct udev *udev, struct udev_list_node *name_list);
+extern struct udev_list_entry *udev_list_get_entry(struct udev_list_node *list);
+extern int udev_list_entry_get_flag(struct udev_list_entry *list_entry);
+extern void udev_list_entry_set_flag(struct udev_list_entry *list_entry, int flag);
+#define udev_list_entry_foreach_safe(entry, tmp, first) \
+	for (entry = first, tmp = udev_list_entry_get_next(entry); \
+	     entry != NULL; \
+	     entry = tmp, tmp = udev_list_entry_get_next(tmp))
+
+/* libudev-queue */
+extern int udev_queue_export_udev_seqnum(struct udev_queue *udev_queue, unsigned long long int seqnum);
+extern int udev_queue_export_device_queued(struct udev_queue *udev_queue, struct udev_device *udev_device);
+extern int udev_queue_export_device_finished(struct udev_queue *udev_queue, struct udev_device *udev_device);
+extern int udev_queue_export_device_failed(struct udev_queue *udev_queue, struct udev_device *udev_device);
 
 /* libudev-utils */
-#define UTIL_PATH_SIZE		1024
-#define UTIL_LINE_SIZE		2048
-#define UTIL_NAME_SIZE		512
-struct util_name_entry {
-	struct list_head node;
-	char *name;
-	char *value;
-	int *i;
-};
+#define UTIL_PATH_SIZE				1024
+#define UTIL_LINE_SIZE				2048
+#define UTIL_NAME_SIZE				512
+#define UDEV_ALLOWED_CHARS_INPUT		"/ $%?,"
 extern ssize_t util_get_sys_subsystem(struct udev *udev, const char *syspath, char *subsystem, size_t size);
 extern ssize_t util_get_sys_driver(struct udev *udev, const char *syspath, char *driver, size_t size);
 extern int util_resolve_sys_link(struct udev *udev, char *syspath, size_t size);
@@ -131,5 +169,9 @@ extern size_t util_path_decode(char *s);
 extern void util_remove_trailing_chars(char *path, char c);
 extern size_t util_strlcpy(char *dst, const char *src, size_t size);
 extern size_t util_strlcat(char *dst, const char *src, size_t size);
-extern int util_replace_chars(char *str, const char *white);
+extern int udev_util_replace_whitespace(const char *str, char *to, size_t len);
+extern int udev_util_replace_chars(char *str, const char *white);
+extern int udev_util_encode_string(const char *str, char *str_enc, size_t len);
+extern void util_set_fd_cloexec(int fd);
+extern unsigned int util_string_hash32(const char *str);
 #endif