[PATCH] libsysfs changes for sysfsutils 0.3.0

Here's the patch to up the library to the sysfsutils-0_3_0 level. The
following changes:

1) adds class name to sysfs_class_device structure
2) adds bus to sysfs_device
3) gets rid of code that made assumptions as to bus addresses being
unique across buses, which isn't the case.


I still owe you:

1) change getpagesize->sysconf. This is in the CVS tree and part of other
changes we're currently testing. Patch will follow.
2) you need a function to get a sysfs_class_device's parent. We hadn't
considered class devices to have parents, the one example of a multilevel
is the block class. We will add this function and send the patch to you.

1 files changed, 33 insertions, 7 deletions

diff --git a/libsysfs/sysfs_utils.c b/libsysfs/sysfs_utils.c
index 3e50bc6120..4e96051c78 100644
--- a/libsysfs/sysfs_utils.c
+++ b/libsysfs/sysfs_utils.c
@@ -92,7 +92,7 @@ int sysfs_get_mnt_path(unsigned char *mnt_path, size_t len)
 		return -1;
 	}
 	sysfs_path = getenv(SYSFS_PATH_ENV);
-	if (sysfs_path != NULL)
+	if (sysfs_path != NULL) 
 		strncpy(mnt_path, sysfs_path, len);
 	else
 		ret = sysfs_get_fs_mnt_path(SYSFS_FSTYPE_NAME, mnt_path, len);
@@ -109,13 +109,19 @@ int sysfs_get_mnt_path(unsigned char *mnt_path, size_t len)
 int sysfs_get_name_from_path(const unsigned char *path, unsigned char *name, 
 								size_t len)
 {
+	unsigned char tmp[SYSFS_PATH_MAX];
 	unsigned char *n = NULL;
                                                                                 
 	if (path == NULL || name == NULL) {
 		errno = EINVAL;
 		return -1;
 	}
-	n = strrchr(path, '/');
+	memset(tmp, 0, SYSFS_PATH_MAX);
+	strcpy(tmp, path);
+	n = &tmp[strlen(tmp)-1];
+	if (strncmp(n, "/", 1) == 0)
+		*n = '\0';	
+	n = strrchr(tmp, '/');
 	if (n == NULL) {
 		errno = EINVAL;
 		return -1;
@@ -169,10 +175,7 @@ int sysfs_get_link(const unsigned char *path, unsigned char *target, size_t len)
 		if (*s == '/')
 			count++;
 	}
-
-	if (s == NULL)
-		return -1;
-
+	
 	strncpy(s, d, (SYSFS_PATH_MAX-strlen(devdir)));
 	strncpy(target, devdir, len);
 
@@ -184,7 +187,7 @@ int sysfs_get_link(const unsigned char *path, unsigned char *target, size_t len)
  * sysfs_del_name: free function for sysfs_open_subsystem_list
  * @name: memory area to be freed
  */ 
-void sysfs_del_name(void *name)
+static void sysfs_del_name(void *name)
 {
 	free(name);
 }
@@ -210,8 +213,10 @@ void sysfs_close_list(struct dlist *list)
 struct dlist *sysfs_open_subsystem_list(unsigned char *name)
 {
 	unsigned char sysfs_path[SYSFS_PATH_MAX], *subsys_name = NULL;
+	unsigned char *c = NULL;
 	struct sysfs_directory *dir = NULL, *cur = NULL;
 	struct dlist *list = NULL;
+	struct stat astats;
 	
 	if (name == NULL)
 		return NULL;
@@ -251,6 +256,27 @@ struct dlist *sysfs_open_subsystem_list(unsigned char *name)
 		}
 	}
 	sysfs_close_directory(dir);
+	/*
+	 * We are now considering "block" as a "class". Hence, if the subsys
+	 * name requested here is "class", verify if "block" is supported on
+	 * this system and return the same.
+	 */ 
+	if (strcmp(name, SYSFS_CLASS_DIR) == 0) {
+		c = strstr(sysfs_path, SYSFS_CLASS_NAME);
+		if (c == NULL)
+			goto out;
+		strcpy(c, SYSFS_BLOCK_NAME);
+		if ((lstat(sysfs_path, &astats)) != 0) {
+			dprintf("stat() failed\n");
+			goto out;
+		}
+		if (S_ISDIR(astats.st_mode)) {
+			subsys_name = (char *)calloc(1, SYSFS_NAME_LEN);
+			strcpy(subsys_name, SYSFS_BLOCK_NAME);
+			dlist_unshift(list, subsys_name);
+		}
+	}
+out:
 	return list;
 }