X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev.h;h=d09c9922cdb40fb8d0ffb503ce7b52c2a1316647;hp=c060b8d6fff6bb28c36d67d107fe551c47c00c84;hb=d3641ff2ac10e9969b5c6c003db03604e2a2aac4;hpb=1aa1e24848903d11780db1ade355be73ad61a937

diff --git a/udev.h b/udev.h
index c060b8d6f..d09c9922c 100644
--- a/udev.h
+++ b/udev.h
@@ -1,8 +1,6 @@
 /*
- * udev.h
- *
  * Copyright (C) 2003 Greg Kroah-Hartman <greg@kroah.com>
- * Copyright (C) 2003-2005 Kay Sievers <kay.sievers@vrfy.org>
+ * Copyright (C) 2003-2006 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
@@ -15,7 +13,7 @@
  * 
  *	You should have received a copy of the GNU General Public License along
  *	with this program; if not, write to the Free Software Foundation, Inc.,
- *	675 Mass Ave, Cambridge, MA 02139, USA.
+ *	51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
  */
 
@@ -27,53 +25,53 @@
 
 #include "list.h"
 #include "logging.h"
-#include "udev_libc_wrapper.h"
+#include "udev_sysdeps.h"
 #include "udev_version.h"
 
-#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 COMMENT_CHARACTER			'#'
+#define PATH_TO_NAME_CHAR			'@'
+#define LINE_SIZE				512
+#define PATH_SIZE				512
+#define NAME_SIZE				128
+#define VALUE_SIZE				128
 
-#define DEFAULT_PARTITIONS_COUNT	15
-#define UDEV_ALARM_TIMEOUT		180
+#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 READ_END				0
+#define WRITE_END				1
 
-#define DB_DIR				".udev/db"
+#define DB_DIR					".udev/db"
 
 struct udev_rules;
 
 struct sysfs_device {
-	struct list_head node;		/* for device cache */
+	struct list_head node;			/* for device cache */
+	struct sysfs_device *parent;		/* already cached parent*/
 	char devpath[PATH_SIZE];
-	char subsystem[NAME_SIZE];	/* $class/$bus/"drivers */
-	char kernel_name[NAME_SIZE];	/* device instance name */
+	char subsystem[NAME_SIZE];		/* $class, $bus, drivers, module */
+	char kernel[NAME_SIZE];			/* device instance name */
 	char kernel_number[NAME_SIZE];
-	char driver[NAME_SIZE];		/* device driver name */
+	char driver[NAME_SIZE];			/* device driver name */
 };
 
 struct udevice {
 	/* device event */
-	struct sysfs_device *dev;
+	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];
 
 	/* node */
 	char name[PATH_SIZE];
 	struct list_head symlink_list;
 	int symlink_final;
-	char owner[USER_SIZE];
+	char owner[NAME_SIZE];
 	int owner_final;
-	char group[USER_SIZE];
+	char group[NAME_SIZE];
 	int group_final;
 	mode_t mode;
 	int mode_final;
@@ -109,15 +107,19 @@ extern dev_t udev_device_get_devt(struct udevice *udev);
 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 void sysfs_device_set_values(struct sysfs_device *dev, const char *devpath,
+				    const char *subsystem, const char *driver);
 extern struct sysfs_device *sysfs_device_get(const char *devpath);
 extern struct sysfs_device *sysfs_device_get_parent(struct sysfs_device *dev);
+extern struct sysfs_device *sysfs_device_get_parent_with_subsystem(struct sysfs_device *dev, const char *subsystem);
 extern char *sysfs_attr_get_value(const char *devpath, const char *attr_name);
+extern int sysfs_resolve_link(char *path, size_t size);
 
-/* 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_node.c */
+extern int udev_node_mknod(struct udevice *udev, const char *file, dev_t devt, mode_t mode, uid_t uid, gid_t gid);
+extern int udev_node_add(struct udevice *udev, struct udevice *udev_old);
+extern void udev_node_remove_symlinks(struct udevice *udev);
+extern int udev_node_remove(struct udevice *udev);
 
 /* udev_db.c */
 extern int udev_db_add_device(struct udevice *dev);
@@ -132,13 +134,14 @@ struct name_entry {
 	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 char *name_list_add(struct list_head *name_list, const char *name, int sort);
+extern char *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);
+extern uid_t lookup_user(const char *user);
+extern gid_t lookup_group(const char *group);
 
 /* 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);