udevadm: info - use "udev_device"

7 files changed, 124 insertions, 157 deletions

diff --git a/udev/lib/Makefile.am b/udev/lib/Makefile.am
index 000b3f73ca..4cbae2e4ca 100644
--- a/udev/lib/Makefile.am
+++ b/udev/lib/Makefile.am
@@ -20,7 +20,6 @@ include_HEADERS =\
 	libudev.h
 
 libudev_la_SOURCES =\
-	exported_symbools \
 	libudev-private.h \
 	libudev.c \
 	libudev-util.c \
diff --git a/udev/lib/exported_symbols b/udev/lib/exported_symbols
index 129cb9c36f..058b79afa8 100644
--- a/udev/lib/exported_symbols
+++ b/udev/lib/exported_symbols
@@ -8,6 +8,7 @@ udev_set_log_priority
 udev_get_sys_path
 udev_get_dev_path
 udev_device_new_from_devpath
+udev_device_new_from_parent
 udev_device_ref
 udev_device_unref
 udev_device_get_udev
diff --git a/udev/lib/libudev-device.c b/udev/lib/libudev-device.c
index 0405e1c98a..f3f20cd992 100644
--- a/udev/lib/libudev-device.c
+++ b/udev/lib/libudev-device.c
@@ -34,8 +34,9 @@
 struct udev_device {
 	int refcount;
 	struct udev *udev;
-	char *devpath;
 	char *syspath;
+	const char *devpath;
+	const char *sysname;
 	char *devname;
 	char *subsystem;
 	struct list_head link_list;
@@ -193,10 +194,11 @@ struct udev_device *udev_device_new_from_devpath(struct udev *udev, const char *
 
 	util_strlcpy(path, udev_get_sys_path(udev), sizeof(path));
 	util_strlcat(path, devpath, sizeof(path));
-	if (stat(path, &statbuf) != 0)
-		return NULL;
-	if (!S_ISDIR(statbuf.st_mode))
+	util_strlcat(path, "/uevent", sizeof(path));
+	if (stat(path, &statbuf) != 0) {
+		info(udev, "not a device :%s\n", path);
 		return NULL;
+	}
 
 	udev_device = device_init(udev);
 	if (udev_device == NULL)
@@ -214,6 +216,28 @@ struct udev_device *udev_device_new_from_devpath(struct udev *udev, const char *
 	return udev_device;
 }
 
+struct udev_device *udev_device_new_from_parent(struct udev_device *udev_device)
+{
+	struct udev_device *udev_device_parent = NULL;
+	char path[UTIL_PATH_SIZE];
+	char *pos;
+
+	if (udev_device == NULL)
+		return NULL;
+
+	util_strlcpy(path, udev_device_get_devpath(udev_device), sizeof(path));
+	while (1) {
+		pos = strrchr(path, '/');
+		if (pos == NULL)
+			break;
+		pos[0] = '\0';
+		udev_device_parent = udev_device_new_from_devpath(udev_device->udev, path);
+		if (udev_device_parent != NULL)
+			break;
+	}
+	return udev_device_parent;
+}
+
 /**
  * udev_device_get_udev:
  * @udev_device: udev device
@@ -305,6 +329,13 @@ const char *udev_device_get_syspath(struct udev_device *udev_device)
 	return udev_device->syspath;
 }
 
+const char *udev_device_get_sysname(struct udev_device *udev_device)
+{
+	if (udev_device == NULL)
+		return NULL;
+	return udev_device->sysname;
+}
+
 /**
  * udev_device_get_devname:
  * @udev_device: udev device
@@ -454,6 +485,9 @@ int device_set_devpath(struct udev_device *udev_device, const char *devpath)
 	if (asprintf(&udev_device->syspath, "%s%s", udev_get_sys_path(udev_device->udev), devpath) < 0)
 		return -ENOMEM;
 	udev_device->devpath = &udev_device->syspath[strlen(udev_get_sys_path(udev_device->udev))];
+	udev_device->sysname = strrchr(udev_device->syspath, '/');
+	if (udev_device->sysname != NULL)
+		udev_device->sysname = &udev_device->sysname[1];
 	return 0;
 }
 
diff --git a/udev/lib/libudev.h b/udev/lib/libudev.h
index e1eed568f9..c3d0092f4e 100644
--- a/udev/lib/libudev.h
+++ b/udev/lib/libudev.h
@@ -46,12 +46,14 @@ extern void udev_selinux_lsetfilecon(struct udev *udev, const char *file, unsign
 
 struct udev_device;
 extern struct udev_device *udev_device_new_from_devpath(struct udev *udev, const char *devpath);
+extern struct udev_device *udev_device_new_from_parent(struct udev_device *udev_device);
 extern struct udev_device *udev_device_ref(struct udev_device *udev_device);
 extern void udev_device_unref(struct udev_device *udev_device);
 extern struct udev *udev_device_get_udev(struct udev_device *udev_device);
 extern const char *udev_device_get_devpath(struct udev_device *udev_device);
 extern const char *udev_device_get_subsystem(struct udev_device *udev_device);
 extern const char *udev_device_get_syspath(struct udev_device *udev_device);
+extern const char *udev_device_get_sysname(struct udev_device *udev_device);
 extern const char *udev_device_get_devname(struct udev_device *udev_device);
 extern int udev_device_get_devlinks(struct udev_device *udev_device,
 				    int (*cb)(struct udev_device *udev_device,
diff --git a/udev/lib/list.h b/udev/lib/list.h
index 3266e1b124..c679e50ace 100644
--- a/udev/lib/list.h
+++ b/udev/lib/list.h
@@ -1,17 +1,20 @@
 /*
- * Based on list.h in the Linux kernel source tree.
+ * Simple doubly linked list implementation.
+ *
+ * Based on list.h in the Linux kernel source tree, licensed under
+ * the GNU GPL version 2.
  */
 
 #ifndef _LIST_H
 #define _LIST_H
 
 /**
- * container_of - cast a member of a structure out to the containing structure
- *
+ * container_of:
  * @ptr:	the pointer to the member.
  * @type:	the type of the container struct this is embedded in.
  * @member:	the name of the member within the struct.
  *
+ * cast a member of a structure out to the containing structure
  */
 #define container_of(ptr, type, member) ({			\
 	const typeof( ((type *)0)->member ) *__mptr = (ptr);	\
@@ -25,16 +28,6 @@
 #define LIST_POISON1  ((void *) 0x00100100)
 #define LIST_POISON2  ((void *) 0x00200200)
 
-/*
- * Simple doubly linked list implementation.
- *
- * Some of the internal functions ("__xxx") are useful when
- * manipulating whole lists rather than single entries, as
- * sometimes we already know the next/prev entries and we can
- * generate better code by using them directly rather than
- * using the generic single-entry routines.
- */
-
 struct list_head {
 	struct list_head *next, *prev;
 };
@@ -48,12 +41,7 @@ struct list_head {
 	(ptr)->next = (ptr); (ptr)->prev = (ptr); \
 } while (0)
 
-/*
- * Insert a new entry between two known consecutive entries. 
- *
- * This is only for internal list manipulation where we know
- * the prev/next entries already!
- */
+/* Insert a new entry between two known consecutive entries. */
 static inline void __list_add(struct list_head *new,
 			      struct list_head *prev,
 			      struct list_head *next)
@@ -65,7 +53,7 @@ static inline void __list_add(struct list_head *new,
 }
 
 /**
- * list_add - add a new entry
+ * list_add:
  * @new: new entry to be added
  * @head: list head to add it after
  *
@@ -78,7 +66,7 @@ static inline void list_add(struct list_head *new, struct list_head *head)
 }
 
 /**
- * list_add_tail - add a new entry
+ * list_add_tail:
  * @new: new entry to be added
  * @head: list head to add it before
  *
@@ -93,9 +81,6 @@ static inline void list_add_tail(struct list_head *new, struct list_head *head)
 /*
  * Delete a list entry by making the prev/next entries
  * point to each other.
- *
- * This is only for internal list manipulation where we know
- * the prev/next entries already!
  */
 static inline void __list_del(struct list_head * prev, struct list_head * next)
 {
@@ -104,8 +89,11 @@ static inline void __list_del(struct list_head * prev, struct list_head * next)
 }
 
 /**
- * list_del - deletes entry from list.
+ * list_del:
  * @entry: the element to delete from the list.
+ *
+ * deletes entry from list.
+ *
  * Note: list_empty on entry does not return true after this, the entry is
  * in an undefined state.
  */
@@ -117,19 +105,10 @@ static inline void list_del(struct list_head *entry)
 }
 
 /**
- * list_del_init - deletes entry from list and reinitialize it.
- * @entry: the element to delete from the list.
- */
-static inline void list_del_init(struct list_head *entry)
-{
-	__list_del(entry->prev, entry->next);
-	INIT_LIST_HEAD(entry); 
-}
-
-/**
- * list_move - delete from one list and add as another's head
+ * list_move
  * @list: the entry to move
  * @head: the head that will precede our entry
+ * delete from one list and add as another's head
  */
 static inline void list_move(struct list_head *list, struct list_head *head)
 {
@@ -138,9 +117,11 @@ static inline void list_move(struct list_head *list, struct list_head *head)
 }
 
 /**
- * list_move_tail - delete from one list and add as another's tail
+ * list_move_tail
  * @list: the entry to move
  * @head: the head that will follow our entry
+ *
+ * delete from one list and add as another's tail
  */
 static inline void list_move_tail(struct list_head *list,
 				  struct list_head *head)
@@ -150,109 +131,34 @@ static inline void list_move_tail(struct list_head *list,
 }
 
 /**
- * list_empty - tests whether a list is empty
+ * list_empty:
  * @head: the list to test.
+ *
+ * tests whether a list is empty
  */
 static inline int list_empty(struct list_head *head)
 {
 	return head->next == head;
 }
 
-static inline void __list_splice(struct list_head *list,
-				 struct list_head *head)
-{
-	struct list_head *first = list->next;
-	struct list_head *last = list->prev;
-	struct list_head *at = head->next;
-
-	first->prev = head;
-	head->next = first;
-
-	last->next = at;
-	at->prev = last;
-}
-
-/**
- * list_splice - join two lists
- * @list: the new list to add.
- * @head: the place to add it in the first list.
- */
-static inline void list_splice(struct list_head *list, struct list_head *head)
-{
-	if (!list_empty(list))
-		__list_splice(list, head);
-}
-
 /**
- * list_splice_init - join two lists and reinitialise the emptied list.
- * @list: the new list to add.
- * @head: the place to add it in the first list.
- *
- * The list at @list is reinitialised
- */
-static inline void list_splice_init(struct list_head *list,
-				    struct list_head *head)
-{
-	if (!list_empty(list)) {
-		__list_splice(list, head);
-		INIT_LIST_HEAD(list);
-	}
-}
-
-/**
- * list_entry - get the struct for this entry
+ * list_entry:
  * @ptr:	the &struct list_head pointer.
  * @type:	the type of the struct this is embedded in.
  * @member:	the name of the list_struct within the struct.
+ *
+ * get the struct for this entry
  */
 #define list_entry(ptr, type, member) \
 	container_of(ptr, type, member)
 
 /**
- * list_for_each	-	iterate over a list
- * @pos:	the &struct list_head to use as a loop counter.
- * @head:	the head for your list.
- */
-#define list_for_each(pos, head) \
-	for (pos = (head)->next; pos != (head); \
-		pos = pos->next)
-
-/**
- * __list_for_each	-	iterate over a list
- * @pos:	the &struct list_head to use as a loop counter.
- * @head:	the head for your list.
- *
- * This variant differs from list_for_each() in that it's the
- * simplest possible list iteration code.
- * Use this for code that knows the list to be very short (empty
- * or 1 entry) most of the time.
- */
-#define __list_for_each(pos, head) \
-	for (pos = (head)->next; pos != (head); pos = pos->next)
-
-/**
- * list_for_each_prev	-	iterate over a list backwards
- * @pos:	the &struct list_head to use as a loop counter.
- * @head:	the head for your list.
- */
-#define list_for_each_prev(pos, head) \
-	for (pos = (head)->prev; pos != (head); pos = pos->prev)
-
-/**
- * list_for_each_safe	-	iterate over a list safe against removal of list entry
- * @pos:	the &struct list_head to use as a loop counter.
- * @n:		another &struct list_head to use as temporary storage
- * @head:	the head for your list.
- */
-#define list_for_each_safe(pos, n, head) \
-	for (pos = (head)->next, n = pos->next; pos != (head); \
-		pos = n, n = pos->next)
-
-/**
- * list_for_each_entry	-	iterate over list of given type
+ * list_for_each_entry:
  * @pos:	the type * to use as a loop counter.
  * @head:	the head for your list.
  * @member:	the name of the list_struct within the struct.
+ *
+ * iterate over list of given type
  */
 #define list_for_each_entry(pos, head, member)				\
 	for (pos = list_entry((head)->next, typeof(*pos), member);	\
@@ -260,22 +166,13 @@ static inline void list_splice_init(struct list_head *list,
 	     pos = list_entry(pos->member.next, typeof(*pos), member))
 
 /**
- * list_for_each_entry_reverse - iterate backwards over list of given type.
- * @pos:	the type * to use as a loop counter.
- * @head:	the head for your list.
- * @member:	the name of the list_struct within the struct.
- */
-#define list_for_each_entry_reverse(pos, head, member)			\
-	for (pos = list_entry((head)->prev, typeof(*pos), member);	\
-	     &pos->member != (head); 					\
-	     pos = list_entry(pos->member.prev, typeof(*pos), member))
-
-/**
- * list_for_each_entry_safe - iterate over list of given type safe against removal of list entry
+ * list_for_each_entry_safe:
  * @pos:	the type * to use as a loop counter.
  * @n:		another type * to use as temporary storage
  * @head:	the head for your list.
  * @member:	the name of the list_struct within the struct.
+ *
+ * iterate over list of given type safe against removal of list entry
  */
 #define list_for_each_entry_safe(pos, n, head, member)			\
 	for (pos = list_entry((head)->next, typeof(*pos), member),	\
diff --git a/udev/lib/test-libudev.c b/udev/lib/test-libudev.c
index 1e9469d1c5..7795f5f0fb 100644
--- a/udev/lib/test-libudev.c
+++ b/udev/lib/test-libudev.c
@@ -86,6 +86,23 @@ static int test_device(struct udev *udev, const char *devpath)
 	return 0;
 }
 
+static int test_device_parents(struct udev *udev, const char *devpath)
+{
+	struct udev_device *device;
+
+	printf("looking at device: %s\n", devpath);
+	device = udev_device_new_from_devpath(udev, devpath);
+	while (device != NULL) {
+		struct udev_device *device_parent;
+
+		print_device(device);
+		device_parent = udev_device_new_from_parent(device);
+		udev_device_unref(device);
+		device = device_parent;
+	}
+	return 0;
+}
+
 static int devices_enum_cb(struct udev *udev,
 			   const char *devpath, const char *subsystem, const char *name,
 			   void *data)
@@ -184,6 +201,7 @@ int main(int argc, char *argv[], char *envp[])
 	printf("dev_path: '%s'\n", str);
 
 	test_device(udev, devpath);
+	test_device_parents(udev, devpath);
 	test_enumerate(udev, subsystem);
 	test_monitor(udev, socket);
 
diff --git a/udev/udevadm-info.c b/udev/udevadm-info.c
index 22f3d49d4b..3be5f3154b 100644
--- a/udev/udevadm-info.c
+++ b/udev/udevadm-info.c
@@ -84,16 +84,18 @@ static void print_all_attributes(struct udev *udev, const char *devpath, const c
 
 			printf("    %s{%s}==\"%s\"\n", key, dent->d_name, value);
 		}
+		closedir(dir);
 	}
 	printf("\n");
 }
 
 static int print_device_chain(struct udev *udev, const char *devpath)
 {
-	struct sysfs_device *dev;
+	struct udev_device *device;
+	const char *str;
 
-	dev = sysfs_device_get(udev, devpath);
-	if (dev == NULL)
+	device = udev_device_new_from_devpath(udev, devpath);
+	if (device == NULL)
 		return -1;
 
 	printf("\n"
@@ -104,23 +106,37 @@ static int print_device_chain(struct udev *udev, const char *devpath)
 	       "and the attributes from one single parent device.\n"
 	       "\n");
 
-	printf("  looking at device '%s':\n", dev->devpath);
-	printf("    KERNEL==\"%s\"\n", dev->kernel);
-	printf("    SUBSYSTEM==\"%s\"\n", dev->subsystem);
-	printf("    DRIVER==\"%s\"\n", dev->driver);
-	print_all_attributes(udev, dev->devpath, "ATTR");
-
-	/* walk up the chain of devices */
-	while (1) {
-		dev = sysfs_device_get_parent(udev, dev);
-		if (dev == NULL)
+	printf("  looking at device '%s':\n", udev_device_get_devpath(device));
+	printf("    KERNEL==\"%s\"\n", udev_device_get_sysname(device));
+	str = udev_device_get_subsystem(device);
+	if (str == NULL)
+		str = "";
+	printf("    SUBSYSTEM==\"%s\"\n", str);
+	str = udev_device_get_driver(device);
+	if (str == NULL)
+		str = "";
+	printf("    DRIVER==\"%s\"\n", str);
+	print_all_attributes(udev, udev_device_get_devpath(device), "ATTR");
+
+	while (device != NULL) {
+		struct udev_device *device_parent;
+
+		device_parent = udev_device_new_from_parent(device);
+		udev_device_unref(device);
+		if (device_parent == NULL)
 			break;
-		printf("  looking at parent device '%s':\n", dev->devpath);
-		printf("    KERNELS==\"%s\"\n", dev->kernel);
-		printf("    SUBSYSTEMS==\"%s\"\n", dev->subsystem);
-		printf("    DRIVERS==\"%s\"\n", dev->driver);
-
-		print_all_attributes(udev, dev->devpath, "ATTRS");
+		device = device_parent;
+		printf("  looking at parent device '%s':\n", udev_device_get_devpath(device));
+		printf("    KERNELS==\"%s\"\n", udev_device_get_sysname(device));
+		str = udev_device_get_subsystem(device);
+		if (str == NULL)
+			str = "";
+		printf("    SUBSYSTEMS==\"%s\"\n", str);
+		str = udev_device_get_driver(device);
+		if (str == NULL)
+			str = "";
+		printf("    DRIVERS==\"%s\"\n", str);
+		print_all_attributes(udev, udev_device_get_devpath(device), "ATTRS");
 	}
 
 	return 0;