chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] update to libsysfs 1.2.0 and add some stuff klib_fixup
[elogind.git]
/
libsysfs
/
sysfs_utils.c
diff --git
a/libsysfs/sysfs_utils.c
b/libsysfs/sysfs_utils.c
index f65e5df3aac705525f82180bebc9f3932b4abe6d..8b1f56ed146f73ea47ad012810542a859e4efd07 100644
(file)
--- a/
libsysfs/sysfs_utils.c
+++ b/
libsysfs/sysfs_utils.c
@@
-20,16
+20,13
@@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
*/
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
*/
-#include "
sysfs/
libsysfs.h"
+#include "libsysfs.h"
#include "sysfs.h"
#include "sysfs.h"
-#ifndef __KLIBC__
-#include <mntent.h>
-#endif
-static int sort_char(void *new
_elem, void *old_elem
)
+static int sort_char(void *new
, void *old
)
{
{
- return ((strncmp((char *)new
_elem, (char *)old_elem
,
- strlen((char *)new
_elem
))) < 0 ? 1 : 0);
+ return ((strncmp((char *)new
, (char *)old
,
+ strlen((char *)new))) < 0 ? 1 : 0);
}
/**
}
/**
@@
-66,10
+63,6
@@
int sysfs_remove_trailing_slash(char *path)
static int sysfs_get_fs_mnt_path(const char *fs_type,
char *mnt_path, size_t len)
{
static int sysfs_get_fs_mnt_path(const char *fs_type,
char *mnt_path, size_t len)
{
-#ifdef __KLIBC__
- safestrcpymax(mnt_path, "/sys", len);
- return 0;
-#else
FILE *mnt;
struct mntent *mntent;
int ret = 0;
FILE *mnt;
struct mntent *mntent;
int ret = 0;
@@
-106,7
+99,6
@@
static int sysfs_get_fs_mnt_path(const char *fs_type,
ret = -1;
return ret;
ret = -1;
return ret;
-#endif
}
/*
}
/*
@@
-454,7
+446,7
@@
int sysfs_path_is_link(const char *path)
return 1;
}
if ((lstat(path, &astats)) != 0) {
return 1;
}
if ((lstat(path, &astats)) != 0) {
- dprintf("stat() failed");
+ dprintf("stat() failed
\n
");
return 1;
}
if (S_ISLNK(astats.st_mode))
return 1;
}
if (S_ISLNK(astats.st_mode))
@@
-477,7
+469,7
@@
int sysfs_path_is_file(const char *path)
return 1;
}
if ((lstat(path, &astats)) != 0) {
return 1;
}
if ((lstat(path, &astats)) != 0) {
- dprintf("stat() failed");
+ dprintf("stat() failed
\n
");
return 1;
}
if (S_ISREG(astats.st_mode))
return 1;
}
if (S_ISREG(astats.st_mode))