X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=libsysfs%2Fsysfs_device.c;h=f2f8d2d611b6c121985b32b93b5fdd0d99445d1f;hb=9dfe20eff709a251da92c473ea94615887497e0a;hp=e3a89770160f90f4c264da4e27af3112d0647e14;hpb=d1fb871d99db38c7704d8e583ff5e0a00e713837;p=elogind.git

diff --git a/libsysfs/sysfs_device.c b/libsysfs/sysfs_device.c
index e3a897701..f2f8d2d61 100644
--- a/libsysfs/sysfs_device.c
+++ b/libsysfs/sysfs_device.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"
 
 /**
@@ -53,7 +53,7 @@ static int get_dev_driver(struct sysfs_device *dev)
 	if (c == NULL)
 		return 1;
 	*c = '\0';
-	safestrncat(c, path, (sizeof(devpath) - strlen(devpath)));
+	safestrcatmax(c, path, (sizeof(devpath) - strlen(devpath)));
 
 	drvlist = sysfs_open_subsystem_list(path);
 	if (drvlist != NULL) {
@@ -502,7 +502,7 @@ struct sysfs_attribute *sysfs_get_device_attr(struct sysfs_device *dev,
  * @psize: size of "path"
  * Returns 0 on success -1 on failure
  */
-static int get_device_absolute_path(const char *device, const char *bus, 
+static int get_device_absolute_path(const char *device,	const char *bus, 
 				char *path, size_t psize)
 {
 	char bus_path[SYSFS_PATH_MAX];
@@ -547,7 +547,7 @@ static int get_device_absolute_path(const char *device, const char *bus,
  * 2. Bus the device is on must be supplied
  * 	Use sysfs_find_device_bus to get the bus name
  */
-struct sysfs_device *sysfs_open_device(const char *bus, const char *bus_id)
+struct sysfs_device *sysfs_open_device(const char *bus,	const char *bus_id)
 {
 	char sysfs_path[SYSFS_PATH_MAX];
 	struct sysfs_device *device = NULL;