X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev.h;h=5d54b5443248c894f142169de404bad78d8f4086;hp=ddcfa81c8eee1b95ad02d77257bf6fd2c1fe334f;hb=03b24b71e05d116c592b08281f8a5f0dadf6d3c7;hpb=03cfa1394fcc2c4386f8af22e5a4d9fdd7cecc50

diff --git a/udev.h b/udev.h
index ddcfa81c8..5d54b5443 100644
--- a/udev.h
+++ b/udev.h
@@ -1,9 +1,8 @@
 /*
  * udev.h
  *
- * Userspace devfs
- *
  * Copyright (C) 2003 Greg Kroah-Hartman <greg@kroah.com>
+ * Copyright (C) 2003-2005 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
@@ -25,76 +24,140 @@
 
 #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 ALARM_TIMEOUT			120
-#define COMMENT_CHARACTER		'#'
+#define COMMENT_CHARACTER			'#'
+#define PATH_TO_NAME_CHAR			'@'
+#define LINE_SIZE				512
+#define NAME_SIZE				128
+#define PATH_SIZE				256
+#define USER_SIZE				32
+#define SEQNUM_SIZE				32
+#define VALUE_SIZE				128
 
-#define LINE_SIZE			512
-#define NAME_SIZE			256
-#define USER_SIZE			32
+#define DEFAULT_PARTITIONS_COUNT		15
+#define UDEV_ALARM_TIMEOUT			180
 
-#define ACTION_SIZE			32
-#define DEVPATH_SIZE			256
-#define SUBSYSTEM_SIZE			32
-#define SEQNUM_SIZE			32
+#define UDEV_MAX(a,b) ((a) > (b) ? (a) : (b))
 
-#define DEVD_DIR			"/etc/dev.d"
-#define DEVD_SUFFIX			".dev"
+/* pipes */
+#define READ_END				0
+#define WRITE_END				1
 
-#define HOTPLUGD_DIR			"/etc/hotplug.d"
-#define HOTPLUG_SUFFIX			".hotplug"
+#define DB_DIR					".udev/db"
 
-#define DEFAULT_PARTITIONS_COUNT	15
+struct udev_rules;
 
-enum device_type {
-	UNKNOWN,
-	CLASS,
-	BLOCK,
-	NET,
-	PHYSDEV,
+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[DEVPATH_SIZE];
-	char subsystem[SUBSYSTEM_SIZE];
+	/* device event */
+	struct sysfs_device *dev;		/* points to dev_local by default */
+	struct sysfs_device dev_local;
+	struct sysfs_device *dev_parent;	/* current parent device used for matching */
+	char action[NAME_SIZE];
 
-	char name[NAME_SIZE];
-	char devname[NAME_SIZE];
-	char symlink[NAME_SIZE];
+	/* node */
+	char name[PATH_SIZE];
+	struct list_head symlink_list;
+	int symlink_final;
 	char owner[USER_SIZE];
+	int owner_final;
 	char group[USER_SIZE];
+	int group_final;
 	mode_t mode;
-	char type;
+	int mode_final;
 	dev_t devt;
 
-	char tmp_node[NAME_SIZE];
+	/* 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;
-	int config_line;
-	char config_file[NAME_SIZE];
-	char bus_id[SYSFS_NAME_LEN];
-	char program_result[NAME_SIZE];
-	char kernel_number[NAME_SIZE];
-	char kernel_name[NAME_SIZE];
+	char program_result[PATH_SIZE];
 	int test_run;
 };
 
-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);
-extern void udev_multiplex_directory(struct udevice *udev, const char *basedir, const char *suffix);
+/* 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 */
 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_add_device(struct udevice *udev);
+
+/* udev_remove.c */
+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);
+
+/* 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);
 
-extern char sysfs_path[SYSFS_PATH_MAX];
-extern char udev_root[PATH_MAX];
-extern char udev_db_path[PATH_MAX+NAME_MAX];
-extern char udev_config_filename[PATH_MAX+NAME_MAX];
-extern char udev_rules_filename[PATH_MAX+NAME_MAX];
-extern int udev_log;
-extern int udev_dev_d;
-extern int udev_hotplug_d;
+/* 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