X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev%2Flib%2Flibudev-util.c;h=0ff121d774e12701c1f4fb822689222643bae4e7;hb=aa8734ffcb8a895fc8d66ff383cbcf8f4b78f562;hp=7aea8c67fba38ad464895b4889f5bbf397a90403;hpb=75250977137c26f706fc1514aca7982107859b1c;p=elogind.git

diff --git a/udev/lib/libudev-util.c b/udev/lib/libudev-util.c
index 7aea8c67f..0ff121d77 100644
--- a/udev/lib/libudev-util.c
+++ b/udev/lib/libudev-util.c
@@ -17,8 +17,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "config.h"
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <stddef.h>
@@ -27,19 +25,19 @@
 #include <string.h>
 #include <dirent.h>
 #include <ctype.h>
+#include <fcntl.h>
 #include <sys/stat.h>
 
 #include "libudev.h"
 #include "libudev-private.h"
 
-static ssize_t get_sys_link(struct udev *udev, const char *slink, const char *devpath, char *subsystem, size_t size)
+static ssize_t get_sys_link(struct udev *udev, const char *slink, const char *syspath, char *value, size_t size)
 {
 	char path[UTIL_PATH_SIZE];
 	ssize_t len;
 	const char *pos;
 
-	util_strlcpy(path, udev_get_sys_path(udev), sizeof(path));
-	util_strlcat(path, devpath, sizeof(path));
+	util_strlcpy(path, syspath, sizeof(path));
 	util_strlcat(path, "/", sizeof(path));
 	util_strlcat(path, slink, sizeof(path));
 	len = readlink(path, path, sizeof(path));
@@ -50,99 +48,50 @@ static ssize_t get_sys_link(struct udev *udev, const char *slink, const char *de
 	if (pos == NULL)
 		return -1;
 	pos = &pos[1];
-	return util_strlcpy(subsystem, pos, size);
+	info(udev, "resolved link to: '%s'\n", pos);
+	return util_strlcpy(value, pos, size);
 }
 
-ssize_t util_get_sys_subsystem(struct udev *udev, const char *devpath, char *subsystem, size_t size)
+ssize_t util_get_sys_subsystem(struct udev *udev, const char *syspath, char *subsystem, size_t size)
 {
-	return get_sys_link(udev, "subsystem", devpath, subsystem, size);
+	return get_sys_link(udev, "subsystem", syspath, subsystem, size);
 }
 
-ssize_t util_get_sys_driver(struct udev *udev, const char *devpath, char *driver, size_t size)
+ssize_t util_get_sys_driver(struct udev *udev, const char *syspath, char *driver, size_t size)
 {
-	return get_sys_link(udev, "driver", devpath, driver, size);
+	return get_sys_link(udev, "driver", syspath, driver, size);
 }
 
-int util_resolve_sys_link(struct udev *udev, char *devpath, size_t size)
+int util_resolve_sys_link(struct udev *udev, char *syspath, size_t size)
 {
-	char link_path[UTIL_PATH_SIZE];
 	char link_target[UTIL_PATH_SIZE];
 
 	int len;
 	int i;
 	int back;
 
-	util_strlcpy(link_path, udev_get_sys_path(udev), sizeof(link_path));
-	util_strlcat(link_path, devpath, sizeof(link_path));
-	len = readlink(link_path, link_target, sizeof(link_target));
+	len = readlink(syspath, link_target, sizeof(link_target));
 	if (len <= 0)
 		return -1;
 	link_target[len] = '\0';
-	dbg(udev, "path link '%s' points to '%s'\n", devpath, link_target);
+	dbg(udev, "path link '%s' points to '%s'\n", syspath, link_target);
 
 	for (back = 0; strncmp(&link_target[back * 3], "../", 3) == 0; back++)
 		;
-	dbg(udev, "base '%s', tail '%s', back %i\n", devpath, &link_target[back * 3], back);
+	dbg(udev, "base '%s', tail '%s', back %i\n", syspath, &link_target[back * 3], back);
 	for (i = 0; i <= back; i++) {
-		char *pos = strrchr(devpath, '/');
+		char *pos = strrchr(syspath, '/');
 
 		if (pos == NULL)
 			return -1;
 		pos[0] = '\0';
 	}
-	dbg(udev, "after moving back '%s'\n", devpath);
-	util_strlcat(devpath, "/", size);
-	util_strlcat(devpath, &link_target[back * 3], size);
+	dbg(udev, "after moving back '%s'\n", syspath);
+	util_strlcat(syspath, "/", size);
+	util_strlcat(syspath, &link_target[back * 3], size);
 	return 0;
 }
 
-struct util_name_entry *util_name_list_add(struct udev *udev, struct list_head *name_list,
-					   const char *name, int sort)
-{
-	struct util_name_entry *name_loop;
-	struct util_name_entry *name_new;
-
-	/* avoid duplicate entries */
-	list_for_each_entry(name_loop, name_list, node) {
-		if (strcmp(name_loop->name, name) == 0) {
-			dbg(udev, "'%s' is already in the list\n", name);
-			return name_loop;
-		}
-	}
-
-	if (sort) {
-		list_for_each_entry(name_loop, name_list, node) {
-			if (strcmp(name_loop->name, name) > 0)
-				break;
-		}
-	}
-
-	name_new = malloc(sizeof(struct util_name_entry));
-	if (name_new == NULL)
-		return NULL;
-	memset(name_new, 0x00, sizeof(struct util_name_entry));
-	name_new->name = strdup(name);
-	if (name_new->name == NULL) {
-		free(name_new);
-		return NULL;
-	}
-	dbg(udev, "adding '%s'\n", name_new->name);
-	list_add_tail(&name_new->node, &name_loop->node);
-	return name_new;
-}
-
-void util_name_list_cleanup(struct udev *udev, struct list_head *name_list)
-{
-	struct util_name_entry *name_loop;
-	struct util_name_entry *name_tmp;
-
-	list_for_each_entry_safe(name_loop, name_tmp, name_list, node) {
-		list_del(&name_loop->node);
-		free(name_loop->name);
-		free(name_loop);
-	}
-}
-
 int util_log_priority(const char *priority)
 {
 	char *endptr;