X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=libsysfs%2Fsysfs_class.c;h=54f22eee247abe76c16638ca418e7973349e7a1e;hp=a0273565d5610f80524a76736023eb5cb053b66b;hb=edcd336477880368915245a4b7ddd1bca5940b30;hpb=bc1530c65c282e27eb60de797291ca45c2d8cda2

diff --git a/libsysfs/sysfs_class.c b/libsysfs/sysfs_class.c
index a0273565d..54f22eee2 100644
--- a/libsysfs/sysfs_class.c
+++ b/libsysfs/sysfs_class.c
@@ -116,14 +116,16 @@ static struct sysfs_directory *open_class_dir(const unsigned char *name)
 		return NULL;
 	}
 
+	if (sysfs_trailing_slash(classpath) == 0)
+		strcat(classpath, "/");
 	/* 
 	 * We shall now treat "block" also as a class. Hence, check here
 	 * if "name" is "block" and proceed accordingly
 	 */
 	if (strcmp(name, SYSFS_BLOCK_NAME) == 0) {
-		strcat(classpath, SYSFS_BLOCK_DIR);
+		strcat(classpath, SYSFS_BLOCK_NAME);
 	} else {
-		strcat(classpath, SYSFS_CLASS_DIR);
+		strcat(classpath, SYSFS_CLASS_NAME);
 		strcat(classpath, "/");
 		strcat(classpath, name);
 	}
@@ -365,10 +367,13 @@ static int get_classdev_path(const unsigned char *classname,
                 dprintf("Error getting sysfs mount path\n");
                 return -1;
 	}
+	if (sysfs_trailing_slash(path) == 0)
+		strcat(path, "/");
+
 	if (strcmp(classname, SYSFS_BLOCK_NAME) == 0) {
-		strcat(path, SYSFS_BLOCK_DIR);
+		strcat(path, SYSFS_BLOCK_NAME);
 	} else {
-		strcat(path, SYSFS_CLASS_DIR);
+		strcat(path, SYSFS_CLASS_NAME);
 		strcat(path, "/");
 		strcat(path, classname);
 	}