[PATCH] update to libsysfs 1.2.0 and add some stuff klib_fixup

[elogind.git] / libsysfs / sysfs_dir.c

diff --git a/libsysfs/sysfs_dir.c b/libsysfs/sysfs_dir.c
index be54a1cf8689fe884dda70c59c45ab3db416dd0b..52769916cc7f3cf83a93aa63cf35dad62ab797fb 100644 (file)
--- a/libsysfs/sysfs_dir.c
+++ b/libsysfs/sysfs_dir.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"
 
 /**
@@ -239,10 +239,10 @@ int sysfs_write_attribute(struct sysfs_attribute *sysattr,
                        sysattr->value = (char *)realloc
                                (sysattr->value, length);
                        sysattr->len = length;
-                       safestrncpy(sysattr->value, new_value, length);
+                       safestrcpymax(sysattr->value, new_value, length);
                } else {
                        /*"length" of the new value is same as old one */ 
-                       safestrncpy(sysattr->value, new_value, length);
+                       safestrcpymax(sysattr->value, new_value, length);
                }
        }
                        
@@ -273,7 +273,7 @@ int sysfs_read_attribute(struct sysfs_attribute *sysattr)
                errno = EACCES;
                return -1;
        }
-       pgsize = getpagesize();
+       pgsize = sysconf(_SC_PAGESIZE);
        fbuf = (char *)calloc(1, pgsize+1);
        if (fbuf == NULL) {
                dprintf("calloc failed\n");
@@ -348,7 +348,7 @@ int sysfs_read_attribute_value(const char *attrpath,
        if (length > vsize) 
                dprintf("Value length %d is larger than supplied buffer %d\n",
                        length, vsize);
-       safestrncpy(value, attr->value, vsize);
+       safestrcpymax(value, attr->value, vsize);
        sysfs_close_attribute(attr);
 
        return 0;
@@ -513,6 +513,7 @@ struct sysfs_link *sysfs_open_link(const char *linkpath)
        safestrcpy(ln->path, linkpath);
        if ((sysfs_get_name_from_path(linkpath, ln->name, SYSFS_NAME_LEN)) != 0
            || (sysfs_get_link(linkpath, ln->target, SYSFS_PATH_MAX)) != 0) {
+               sysfs_close_link(ln);
                errno = EINVAL;
                dprintf("Invalid link path %s\n", linkpath);
                return NULL;
@@ -884,7 +885,8 @@ struct sysfs_attribute *sysfs_get_directory_attribute
        attr = (struct sysfs_attribute *)dlist_find_custom
                        (dir->attributes, attrname, dir_attribute_name_equal);
        if (attr != NULL) {
-               if ((sysfs_read_attribute(attr)) != 0) {
+               if ((attr->method & SYSFS_METHOD_SHOW) &&
+                       (sysfs_read_attribute(attr)) != 0) {
                        dprintf("Error reading attribute %s\n", attr->name);
                        return NULL;
                }