replace libsysfs

We never used any of the libsysfs convenience features. Here we replace
it completely with 300 lines of code, which are much simpler and a bit
faster cause udev(d) does not open any syfs file for a simple event which
does not need any parent device information.

Signed-off-by: Kay Sievers <kay.sievers@suse.de>

1 files changed, 80 insertions, 28 deletions

diff --git a/udev.h b/udev.h
index ca99da512d..c060b8d6ff 100644
--- a/udev.h
+++ b/udev.h
@@ -24,8 +24,11 @@
 
 #include <sys/types.h>
 #include <sys/param.h>
-#include "libsysfs/sysfs/libsysfs.h"
+
 #include "list.h"
+#include "logging.h"
+#include "udev_libc_wrapper.h"
+#include "udev_version.h"
 
 #define COMMENT_CHARACTER		'#'
 #define PATH_TO_NAME_CHAR		'@'
@@ -39,24 +42,32 @@
 #define DEFAULT_PARTITIONS_COUNT	15
 #define UDEV_ALARM_TIMEOUT		180
 
+#define UDEV_MAX(a,b) ((a) > (b) ? (a) : (b))
+
+/* pipes */
+#define READ_END			0
+#define WRITE_END			1
+
 #define DB_DIR				".udev/db"
 
 struct udev_rules;
 
-enum device_type {
-	DEV_UNKNOWN,
-	DEV_CLASS,
-	DEV_BLOCK,
-	DEV_NET,
-	DEV_DEVICE,
+struct sysfs_device {
+	struct list_head node;		/* for device cache */
+	char devpath[PATH_SIZE];
+	char subsystem[NAME_SIZE];	/* $class/$bus/"drivers */
+	char kernel_name[NAME_SIZE];	/* device instance name */
+	char kernel_number[NAME_SIZE];
+	char driver[NAME_SIZE];		/* device driver name */
 };
 
 struct udevice {
-	char devpath[PATH_SIZE];
-	char subsystem[NAME_SIZE];
+	/* device event */
+	struct sysfs_device *dev;
+	struct sysfs_device dev_local;
 	char action[NAME_SIZE];
 
-	enum device_type type;
+	/* node */
 	char name[PATH_SIZE];
 	struct list_head symlink_list;
 	int symlink_final;
@@ -67,42 +78,83 @@ struct udevice {
 	mode_t mode;
 	int mode_final;
 	dev_t devt;
+
+	/* event processing */
 	struct list_head run_list;
 	int run_final;
 	struct list_head env_list;
-
 	char tmp_node[PATH_SIZE];
 	int partitions;
 	int ignore_device;
 	int ignore_remove;
-	char bus_id[NAME_SIZE];
 	char program_result[PATH_SIZE];
-	char kernel_number[NAME_SIZE];
-	char kernel_name[NAME_SIZE];
 	int test_run;
 };
 
-extern int udev_init_device(struct udevice *udev, const char* devpath, const char *subsystem, const char *action);
-extern void udev_cleanup_device(struct udevice *udev);
-extern dev_t get_devt(struct sysfs_class_device *class_dev);
-extern int udev_process_event(struct udev_rules *rules, struct udevice *udev);
-extern int udev_add_device(struct udevice *udev, struct sysfs_class_device *class_dev);
-extern int udev_remove_device(struct udevice *udev);
-extern void udev_init_config(void);
-extern int udev_start(void);
+/* udev_config.c */
+extern char udev_root[PATH_SIZE];
+extern char udev_config_filename[PATH_SIZE];
+extern char udev_rules_filename[PATH_SIZE];
+extern int udev_log_priority;
+extern int udev_run;
+extern void udev_config_init(void);
+
+/* udev_device.c */
+extern struct udevice *udev_device_init(void);
+extern void udev_device_cleanup(struct udevice *udev);
+extern int udev_device_event(struct udev_rules *rules, struct udevice *udev);
+extern dev_t udev_device_get_devt(struct udevice *udev);
+
+/* udev_sysfs.c */
+extern char sysfs_path[PATH_SIZE];
+extern int sysfs_init(void);
+extern void sysfs_cleanup(void);
+extern void sysfs_device_set_values(struct sysfs_device *dev, const char *devpath, const char *subsystem);
+extern struct sysfs_device *sysfs_device_get(const char *devpath);
+extern struct sysfs_device *sysfs_device_get_parent(struct sysfs_device *dev);
+extern char *sysfs_attr_get_value(const char *devpath, const char *attr_name);
+
+/* udev_add.c / udev_remove.c */
+extern int udev_add_device(struct udevice *udev);
 extern int udev_make_node(struct udevice *udev, const char *file, dev_t devt, mode_t mode, uid_t uid, gid_t gid);
+extern int udev_remove_device(struct udevice *udev);
 
+/* udev_db.c */
 extern int udev_db_add_device(struct udevice *dev);
 extern int udev_db_delete_device(struct udevice *dev);
 extern int udev_db_get_device(struct udevice *udev, const char *devpath);
 extern int udev_db_lookup_name(const char *name, char *devpath, size_t len);
 extern int udev_db_get_all_entries(struct list_head *name_list);
 
-extern char sysfs_path[PATH_SIZE];
-extern char udev_root[PATH_SIZE];
-extern char udev_config_filename[PATH_SIZE];
-extern char udev_rules_filename[PATH_SIZE];
-extern int udev_log_priority;
-extern int udev_run;
+/* udev_utils.c */
+struct name_entry {
+	struct list_head node;
+	char name[PATH_SIZE];
+};
+extern int log_priority(const char *priority);
+extern int name_list_add(struct list_head *name_list, const char *name, int sort);
+extern int name_list_key_add(struct list_head *name_list, const char *key, const char *value);
+extern void name_list_cleanup(struct list_head *name_list);
+extern int add_matching_files(struct list_head *name_list, const char *dirname, const char *suffix);
+
+/* udev_utils_string.c */
+extern int strcmp_pattern(const char *p, const char *s);
+extern int string_is_true(const char *str);
+extern void remove_trailing_chars(char *path, char c);
+extern int utf8_encoded_valid_unichar(const char *str);
+extern int replace_untrusted_chars(char *str);
+
+/* udev_utils_file.c */
+extern int create_path(const char *path);
+extern int delete_path(const char *path);
+extern int file_map(const char *filename, char **buf, size_t *bufsize);
+extern void file_unmap(void *buf, size_t bufsize);
+extern int unlink_secure(const char *filename);
+extern size_t buf_get_line(const char *buf, size_t buflen, size_t cur);
+
+/* udev_utils_run.c */
+extern int pass_env_to_socket(const char *name, const char *devpath, const char *action);
+extern int run_program(const char *command, const char *subsystem,
+		       char *result, size_t ressize, size_t *reslen, int log);
 
 #endif