X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=libsysfs%2Fsysfs_class.c;h=4ea7f41c99c293410482acfed888498e47f79d27;hp=7a696355ca03d18556248083eda20773727cab36;hb=3f930093f9ac79dca6bcc2dcbc8714c143709478;hpb=d1fb871d99db38c7704d8e583ff5e0a00e713837

diff --git a/libsysfs/sysfs_class.c b/libsysfs/sysfs_class.c
index 7a696355c..4ea7f41c9 100644
--- a/libsysfs/sysfs_class.c
+++ b/libsysfs/sysfs_class.c
@@ -20,7 +20,7 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  *
  */
-#include "sysfs/libsysfs.h"
+#include "libsysfs.h"
 #include "sysfs.h"
 
 static void sysfs_close_cls_dev(void *dev)
@@ -111,7 +111,7 @@ static void set_classdev_classname(struct sysfs_class_device *cdev)
 	if (c == NULL) {
 		c = strstr(cdev->path, SYSFS_BLOCK_NAME);
 	} else {
-		c = strstr(c, "/");
+		c = strchr(c, '/');
 	}
 
 	if (c == NULL)
@@ -509,16 +509,16 @@ static int get_classdev_path(const char *classname, const char *clsdev,
 	}
 	if (strncmp(classname, SYSFS_BLOCK_NAME,
 				sizeof(SYSFS_BLOCK_NAME)) == 0) {
-		safestrncat(path, "/", len);
-		safestrncat(path, SYSFS_BLOCK_NAME, len);
+		safestrcatmax(path, "/", len);
+		safestrcatmax(path, SYSFS_BLOCK_NAME, len);
 	} else {
-		safestrncat(path, "/", len);
-		safestrncat(path, SYSFS_CLASS_NAME, len);
-		safestrncat(path, "/", len);
-		safestrncat(path, classname, len);
+		safestrcatmax(path, "/", len);
+		safestrcatmax(path, SYSFS_CLASS_NAME, len);
+		safestrcatmax(path, "/", len);
+		safestrcatmax(path, classname, len);
 	}
-	safestrncat(path, "/", len);
-	safestrncat(path, clsdev, len);
+	safestrcatmax(path, "/", len);
+	safestrcatmax(path, clsdev, len);
 	return 0;
 }
 
@@ -640,6 +640,9 @@ struct sysfs_attribute *sysfs_get_classdev_attr
 			return cur;
 	}
 
+	if (clsdev->directory == NULL)
+		return NULL;
+
 	if (clsdev->directory->subdirs == NULL) 
 		if ((sysfs_read_dir_subdirs(clsdev->directory)) != 0 ||
 		    clsdev->directory->subdirs == NULL)