X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=libsysfs%2Fsysfs_bus.c;h=921ef32094e1139f281040994cabfe3a96d9e938;hb=7a551dc35580988d13ff8e6e3e37398ac779181a;hp=b2e2b2dd7163b6d13c1d5248c99f98b487b2b806;hpb=070f54223f66490e9d25719c495e074f77da8985;p=elogind.git

diff --git a/libsysfs/sysfs_bus.c b/libsysfs/sysfs_bus.c
index b2e2b2dd7..921ef3209 100644
--- a/libsysfs/sysfs_bus.c
+++ b/libsysfs/sysfs_bus.c
@@ -3,7 +3,7 @@
  *
  * Generic bus utility functions for libsysfs
  *
- * Copyright (C) 2003 International Business Machines, Inc.
+ * Copyright (C) IBM Corp. 2003-2005
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public
@@ -23,279 +23,295 @@
 #include "libsysfs.h"
 #include "sysfs.h"
 
-/**
- * sysfs_close_bus: close single bus
- * @bus: bus structure
- */
-void sysfs_close_bus(struct sysfs_bus *bus)
+static void sysfs_close_dev(void *dev)
 {
-	struct sysfs_device *curdev = NULL, *nextdev = NULL;
-	struct sysfs_driver *curdrv = NULL, *nextdrv = NULL;
-
-	if (bus != NULL) {
-		if (bus->directory != NULL)
-			sysfs_close_directory(bus->directory);
-		for (curdev = bus->devices; curdev != NULL;
-		     curdev = nextdev) {
-			nextdev = curdev->next;
-			sysfs_close_device(curdev);
-		}
-		for (curdrv = bus->drivers; curdrv != NULL;
-		     curdrv = nextdrv) {
-			nextdrv = curdrv->next;
-			sysfs_close_driver(curdrv);
-		}
-		free(bus);
-	}
+        sysfs_close_device((struct sysfs_device *)dev);
 }
 
-/**
- * alloc_bus: mallocs new bus structure
- * returns sysfs_bus_bus struct or NULL
- */
-static struct sysfs_bus *alloc_bus(void)
+static void sysfs_close_drv(void *drv)
 {
-	return (struct sysfs_bus *)calloc(1, sizeof(struct sysfs_bus));
+        sysfs_close_driver((struct sysfs_driver *)drv);
 }
 
-/**
- * open_bus_dir: opens up sysfs bus directory
- * returns sysfs_directory struct with success and NULL with error
+/*
+ * compares names.
+ * @a: name looked for
+ * @b: sysfs_device comparing being compared
+ * returns 1 if a==b->name or 0 not equal
  */
-static struct sysfs_directory *open_bus_dir(const char *name)
+static int name_equal(void *a, void *b)
 {
-	struct sysfs_directory *busdir = NULL, *cur = NULL, *next = NULL;
-	char buspath[SYSFS_PATH_MAX];
+	if (!a || !b)
+		return 0;
 
-	if (name == NULL) {
-		errno = EINVAL;
-		return NULL;
-	}
+	if (strcmp(((char *)a), ((struct sysfs_device *)b)->name) == 0)
+		return 1;
 
-	memset(buspath, 0, SYSFS_PATH_MAX);
-	if ((sysfs_get_mnt_path(buspath, SYSFS_PATH_MAX)) != 0) {
-		dprintf(stderr, "Sysfs not supported on this system\n");
-		return NULL;
-	}
-
-	strcat(buspath, SYSFS_BUS_DIR);
-	strcat(buspath, "/");
-	strcat(buspath, name);
-	busdir = sysfs_open_directory(buspath);
-	if (busdir == NULL) {
-		errno = EINVAL;
-		dprintf(stderr,"Bus %s not supported on this system\n",
-			name);
-		return NULL;
-	}
-	if ((sysfs_read_directory(busdir)) != 0) {
-		dprintf(stderr, "Error reading %s bus dir %s\n", name, 
-			buspath);
-		sysfs_close_directory(busdir);
-		return NULL;
-	}
-	/* read in devices and drivers subdirs */
-	for (cur = busdir->subdirs; cur != NULL; cur = next) {
-		next = cur->next;
-		if ((sysfs_read_directory(cur)) != 0)
-			continue;
-	}
-
-	return busdir;
+	return 0;
 }
 
 /**
- * add_dev_to_bus: adds a bus device to bus device list
- * @bus: bus to add the device
- * @dev: device to add
+ * sysfs_close_bus: close single bus
+ * @bus: bus structure
  */
-static void add_dev_to_bus(struct sysfs_bus *bus, struct sysfs_device *dev)
+void sysfs_close_bus(struct sysfs_bus *bus)
 {
-	if (bus != NULL && dev != NULL) {
-		dev->next = bus->devices;
-		bus->devices = dev;
+	if (bus) {
+		if (bus->attrlist)
+			dlist_destroy(bus->attrlist);
+		if (bus->devices)
+			dlist_destroy(bus->devices);
+		if (bus->drivers)
+			dlist_destroy(bus->drivers);
+		free(bus);
 	}
 }
 
 /**
- * add_driver_to_bus: adds a bus driver to bus driver list
- * @bus: bus to add driver to
- * @driver: driver to add
+ * alloc_bus: mallocs new bus structure
+ * returns sysfs_bus_bus struct or NULL
  */
-static void add_driver_to_bus(struct sysfs_bus *bus, 
-				struct sysfs_driver *driver)
+static struct sysfs_bus *alloc_bus(void)
 {
-	if (bus != NULL && driver != NULL) {
-		driver->next = bus->drivers;
-		bus->drivers = driver;
-	}
+	return (struct sysfs_bus *)calloc(1, sizeof(struct sysfs_bus));
 }
 
 /**
- * get_all_bus_devices: gets all devices for bus
+ * sysfs_get_bus_devices: gets all devices for bus
  * @bus: bus to get devices for
- * returns 0 with success and -1 with failure
+ * returns dlist of devices with success and NULL with failure
  */
-static int get_all_bus_devices(struct sysfs_bus *bus)
+struct dlist *sysfs_get_bus_devices(struct sysfs_bus *bus)
 {
-	struct sysfs_device *bdev = NULL;
-	struct sysfs_directory *cur = NULL;
-	struct sysfs_dlink *curl = NULL, *nextl = NULL;
-	char dirname[SYSFS_NAME_LEN];
+	struct sysfs_device *dev;
+	struct dlist *linklist;
+	char path[SYSFS_PATH_MAX], devpath[SYSFS_PATH_MAX];
+	char target[SYSFS_PATH_MAX];
+	char *curlink;
 
-	if (bus == NULL || bus->directory == NULL) {
+	if (!bus) {
 		errno = EINVAL;
-		return -1;
+		return NULL;
 	}
-	for (cur = bus->directory->subdirs; cur != NULL; cur = cur->next) {
-		memset(dirname, 0, SYSFS_NAME_LEN);
-		if ((sysfs_get_name_from_path(cur->path, dirname,
-		    SYSFS_NAME_LEN)) != 0)
-			continue;
-		if (strcmp(dirname, SYSFS_DEVICES_NAME) != 0)
-			continue;
-		for (curl = cur->links; curl != NULL; curl = nextl) {
-			nextl = curl->next;
-			bdev = sysfs_open_device(curl->target->path);
-			if (bdev == NULL) {
-				dprintf(stderr, "Error opening device at %s\n",
-					curl->target->path);
+	memset(path, 0, SYSFS_PATH_MAX);
+	safestrcpy(path, bus->path);
+	safestrcat(path, "/");
+	safestrcat(path, SYSFS_DEVICES_NAME);
+
+	linklist = read_dir_links(path);
+	if (linklist) {
+		dlist_for_each_data(linklist, curlink, char) {
+			if (bus->devices) {
+				dev = (struct sysfs_device *)
+					dlist_find_custom(bus->devices,
+					(void *)curlink, name_equal);
+				if (dev)
+					continue;
+			}
+			safestrcpy(devpath, path);
+			safestrcat(devpath, "/");
+			safestrcat(devpath, curlink);
+			if (sysfs_get_link(devpath, target, SYSFS_PATH_MAX)) {
+				dprintf("Error getting link - %s\n", devpath);
 				continue;
 			}
-			add_dev_to_bus(bus, bdev);
+			dev = sysfs_open_device_path(target);
+			if (!dev) {
+				dprintf("Error opening device at %s\n",	
+								target);
+				continue;
+			}
+			if (!bus->devices)
+				bus->devices = dlist_new_with_delete
+					(sizeof(struct sysfs_device), 
+					 		sysfs_close_dev);
+			dlist_unshift_sorted(bus->devices, dev, sort_list);
 		}
+		sysfs_close_list(linklist);
 	}
-			
-	return 0;
+	return (bus->devices);
 }
 
 /**
- * get_all_bus_drivers: get all pci drivers
- * @bus: pci bus to add drivers to
- * returns 0 with success and -1 with error
+ * sysfs_get_bus_drivers: gets all drivers for bus
+ * @bus: bus to get devices for
+ * returns dlist of devices with success and NULL with failure
  */
-static int get_all_bus_drivers(struct sysfs_bus *bus)
+struct dlist *sysfs_get_bus_drivers(struct sysfs_bus *bus)
 {
-	struct sysfs_driver *driver = NULL;
-	struct sysfs_directory *cur = NULL, *next = NULL;
-	struct sysfs_directory *cursub = NULL, *nextsub = NULL;
-	char dirname[SYSFS_NAME_LEN];
+	struct sysfs_driver *drv;
+	struct dlist *dirlist;
+	char path[SYSFS_PATH_MAX], drvpath[SYSFS_PATH_MAX];
+	char *curdir;
 
-	if (bus == NULL || bus->directory == NULL) {
+	if (!bus) {
 		errno = EINVAL;
-		return -1;
+		return NULL;
 	}
-	for (cur = bus->directory->subdirs; cur != NULL; cur = next) {
-		next = cur->next;
-		memset(dirname, 0, SYSFS_NAME_LEN);
-		if ((sysfs_get_name_from_path(cur->path, dirname,
-		    SYSFS_NAME_LEN)) != 0)
-			continue;
-		if (strcmp(dirname, SYSFS_DRIVERS_NAME) != 0)
-			continue;
-		for (cursub = cur->subdirs; cursub != NULL; cursub = nextsub) {
-			nextsub = cursub->next;
-			driver = sysfs_open_driver(cursub->path);
-			if (driver == NULL) {
-				dprintf(stderr, "Error opening driver at %s\n",
-					cursub->path);
+	memset(path, 0, SYSFS_PATH_MAX);
+	safestrcpy(path, bus->path);
+	safestrcat(path, "/");
+	safestrcat(path, SYSFS_DRIVERS_NAME);
+
+	dirlist = read_dir_subdirs(path);
+	if (dirlist) {
+		dlist_for_each_data(dirlist, curdir, char) {
+			if (bus->drivers) {
+				drv = (struct sysfs_driver *)
+					dlist_find_custom(bus->drivers,
+					(void *)curdir, name_equal);
+				if (drv)
+					continue;
+			}
+			safestrcpy(drvpath, path);
+			safestrcat(drvpath, "/");
+			safestrcat(drvpath, curdir);
+			drv = sysfs_open_driver_path(drvpath);
+			if (!drv) {
+				dprintf("Error opening driver at %s\n",	
+								drvpath);
 				continue;
 			}
-			add_driver_to_bus(bus, driver);
+			if (!bus->drivers)
+				bus->drivers = dlist_new_with_delete
+					(sizeof(struct sysfs_driver), 
+					 		sysfs_close_drv);
+			dlist_unshift_sorted(bus->drivers, drv, sort_list);
 		}
+		sysfs_close_list(dirlist);
 	}
-	
-	return 0;
+	return (bus->drivers);
 }
 
 /**
- * match_bus_device_to_driver: returns 1 if device is bound to driver
- * @driver: driver to match
- * @busid: busid of device to match
- * returns 1 if found and 0 if not found
+ * sysfs_open_bus: opens specific bus and all its devices on system
+ * returns sysfs_bus structure with success or NULL with error.
  */
-static int match_bus_device_to_driver(struct sysfs_driver *driver, char *busid)
+struct sysfs_bus *sysfs_open_bus(const char *name)
 {
-	struct sysfs_dlink *cur = NULL, *next = NULL;
-	int found = 0;
+	struct sysfs_bus *bus;
+	char buspath[SYSFS_PATH_MAX];
 
-	if (driver == NULL || driver->directory == NULL || busid == NULL) {
+	if (!name) {
 		errno = EINVAL;
-		return found;
+		return NULL;
 	}
-	for (cur = driver->directory->links; cur != NULL && found == 0;
-	     cur = next) {
-		next = cur->next;
-		if ((strcmp(cur->name, busid)) == 0)
-			found++;
+
+	memset(buspath, 0, SYSFS_PATH_MAX);
+	if (sysfs_get_mnt_path(buspath, SYSFS_PATH_MAX)) {
+		dprintf("Sysfs not supported on this system\n");
+		return NULL;
+	}
+
+	safestrcat(buspath, "/");
+	safestrcat(buspath, SYSFS_BUS_NAME);
+	safestrcat(buspath, "/");
+	safestrcat(buspath, name);
+	if (sysfs_path_is_dir(buspath)) {
+		dprintf("Invalid path to bus: %s\n", buspath);
+		return NULL;
+	}
+	bus = alloc_bus();
+	if (!bus) {
+		dprintf("calloc failed\n");
+		return NULL;
+	}
+	safestrcpy(bus->name, name);	
+	safestrcpy(bus->path, buspath);
+	if (sysfs_remove_trailing_slash(bus->path)) {
+		dprintf("Incorrect path to bus %s\n", bus->path);
+		sysfs_close_bus(bus);
+		return NULL;
 	}
-	return found;
+
+	return bus;
 }
 
 /**
- * link_bus_devices_to_drivers: goes through and links devices to drivers
- * @bus: bus to link
+ * sysfs_get_bus_device: Get specific device on bus using device's id
+ * @bus: bus to find device on
+ * @id: bus_id for device
+ * returns struct sysfs_device reference or NULL if not found.
  */
-static void link_bus_devices_to_drivers(struct sysfs_bus *bus)
+struct sysfs_device *sysfs_get_bus_device(struct sysfs_bus *bus, 
+		const char *id)
 {
-	struct sysfs_device *dev = NULL, *nextdev = NULL;
-	struct sysfs_driver *drv = NULL, *nextdrv = NULL;
+	struct sysfs_device *dev = NULL;
+	char devpath[SYSFS_PATH_MAX], target[SYSFS_PATH_MAX];
 	
-	if (bus != NULL && bus->devices != NULL && bus->drivers != NULL) {
-		for (dev = bus->devices; dev != NULL; dev = nextdev) {
-			nextdev = dev->next;
+	if (!bus || !id) {
+		errno = EINVAL;
+		return NULL;
+	}
 
-			for (drv = bus->drivers; drv != NULL; drv = nextdrv) {
-				nextdrv = drv->next;
-				if ((match_bus_device_to_driver(drv, 
-				    dev->bus_id)) != 0) {
-					dev->driver = drv;
-					drv->device = dev;
-				}
-			}
+	if (bus->devices) {
+		dev = (struct sysfs_device *)dlist_find_custom
+			(bus->devices, (void *)id, name_equal);
+		if (dev)
+			return dev;
+	}
+	safestrcpy(devpath, bus->path);
+	safestrcat(devpath, "/");
+	safestrcat(devpath, SYSFS_DEVICES_NAME);
+	safestrcat(devpath, "/");
+	safestrcat(devpath, id);
+	if (sysfs_path_is_link(devpath)) {
+		dprintf("No such device %s on bus %s?\n", id, bus->name);
+		return NULL;
+	}
+	if (!sysfs_get_link(devpath, target, SYSFS_PATH_MAX)) {
+		dev = sysfs_open_device_path(target);
+		if (!dev) {
+			dprintf("Error opening device at %s\n", target);
+			return NULL;
 		}
+		if (!bus->devices)
+			bus->devices = dlist_new_with_delete
+					(sizeof(struct sysfs_device), 
+					 		sysfs_close_dev);
+		dlist_unshift_sorted(bus->devices, dev, sort_list);
 	}
+	return dev;
 }
 
 /**
- * sysfs_open_bus: opens specific bus and all its devices on system
- * returns sysfs_bus structure with success or NULL with error.
+ * sysfs_get_bus_driver: Get specific driver on bus using driver name
+ * @bus: bus to find driver on
+ * @drvname: name of driver
+ * returns struct sysfs_driver reference or NULL if not found.
  */
-struct sysfs_bus *sysfs_open_bus(const char *name)
+struct sysfs_driver *sysfs_get_bus_driver(struct sysfs_bus *bus,
+		const char *drvname)
 {
-	struct sysfs_bus *bus = NULL;
-	struct sysfs_directory *busdir = NULL;
-
-	if (name == NULL) {
+	struct sysfs_driver *drv;
+	char drvpath[SYSFS_PATH_MAX];
+	
+	if (!bus || !drvname) {
 		errno = EINVAL;
 		return NULL;
 	}
 
-	bus = alloc_bus();
-	if (bus == NULL) {
-		perror("malloc");
-		return NULL;
-	}
-	strcpy(bus->name, name);	
-	busdir = open_bus_dir(name);
-	if (busdir == NULL) {
-		dprintf(stderr,"Invalid bus, %s not supported on this system\n",
-			name);
-		sysfs_close_bus(bus);
-		return NULL;
-	}
-	bus->directory = busdir;
-	if ((get_all_bus_devices(bus)) != 0) {
-		dprintf(stderr, "Error reading %s bus devices\n", name);
-		sysfs_close_bus(bus);
-		return NULL;
+	if (bus->drivers) {
+		drv = (struct sysfs_driver *)dlist_find_custom
+			(bus->drivers, (void *)drvname, name_equal);
+		if (drv)
+			return drv;
 	}
-	if ((get_all_bus_drivers(bus)) != 0) {
-		dprintf(stderr, "Error reading %s bus drivers\n", name);
-		sysfs_close_bus(bus);
+	safestrcpy(drvpath, bus->path);
+	safestrcat(drvpath, "/");
+	safestrcat(drvpath, SYSFS_DRIVERS_NAME);
+	safestrcat(drvpath, "/");
+	safestrcat(drvpath, drvname);
+	drv = sysfs_open_driver_path(drvpath);
+	if (!drv) {
+		dprintf("Error opening driver at %s\n", drvpath);
 		return NULL;
 	}
-	link_bus_devices_to_drivers(bus);
-
-	return bus;
+	if (!bus->drivers)
+		bus->drivers = dlist_new_with_delete
+				(sizeof(struct sysfs_driver), 
+				 		sysfs_close_drv);
+	dlist_unshift_sorted(bus->drivers, drv, sort_list);
+	return drv;
 }
+