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] more Libsysfs updates
[elogind.git]
/
libsysfs
/
sysfs_utils.c
diff --git
a/libsysfs/sysfs_utils.c
b/libsysfs/sysfs_utils.c
index 699a9829b8134409cfd5ebb546d5014aec8f63e9..492c7fa668e5dd3ec445d29085e6ce70ab05f091 100644
(file)
--- a/
libsysfs/sysfs_utils.c
+++ b/
libsysfs/sysfs_utils.c
@@
-67,7
+67,7
@@
static int sysfs_get_fs_mnt_path(const char *fs_type,
char *mnt_path, size_t len)
{
#ifdef __KLIBC__
char *mnt_path, size_t len)
{
#ifdef __KLIBC__
- safestr
ncpy
(mnt_path, "/sys", len);
+ safestr
cpymax
(mnt_path, "/sys", len);
return 0;
#else
FILE *mnt;
return 0;
#else
FILE *mnt;
@@
-89,7
+89,7
@@
static int sysfs_get_fs_mnt_path(const char *fs_type,
if (strcmp(mntent->mnt_type, fs_type) == 0) {
dirlen = strlen(mntent->mnt_dir);
if (dirlen <= (len - 1)) {
if (strcmp(mntent->mnt_type, fs_type) == 0) {
dirlen = strlen(mntent->mnt_dir);
if (dirlen <= (len - 1)) {
- safestr
ncpy
(mnt_path, mntent->mnt_dir, len);
+ safestr
cpymax
(mnt_path, mntent->mnt_dir, len);
} else {
dprintf("Error - mount path too long\n");
ret = -1;
} else {
dprintf("Error - mount path too long\n");
ret = -1;
@@
-126,7
+126,7
@@
int sysfs_get_mnt_path(char *mnt_path, size_t len)
}
sysfs_path = getenv(SYSFS_PATH_ENV);
if (sysfs_path != NULL) {
}
sysfs_path = getenv(SYSFS_PATH_ENV);
if (sysfs_path != NULL) {
- safestr
ncpy
(mnt_path, sysfs_path, len);
+ safestr
cpymax
(mnt_path, sysfs_path, len);
if ((sysfs_remove_trailing_slash(mnt_path)) != 0)
return 1;
} else
if ((sysfs_remove_trailing_slash(mnt_path)) != 0)
return 1;
} else
@@
-166,7
+166,7
@@
int sysfs_get_name_from_path(const char *path, char *name, size_t len)
}
}
n++;
}
}
n++;
- safestr
ncpy
(name, n, len);
+ safestr
cpymax
(name, n, len);
return 0;
}
return 0;
}
@@
-221,7
+221,7
@@
int sysfs_get_link(const char *path, char *target, size_t len)
} else {
safestrcpy(temp_path, d);
}
} else {
safestrcpy(temp_path, d);
}
- safestr
ncpy
(target, temp_path, len);
+ safestr
cpymax
(target, temp_path, len);
break;
/*
* relative path
break;
/*
* relative path
@@
-240,12
+240,12
@@
parse_path:
if (*s == '/')
count++;
}
if (*s == '/')
count++;
}
- safestr
ncpy
(s, d, (SYSFS_PATH_MAX-strlen(devdir)));
- safestr
ncpy
(target, devdir, len);
+ safestr
cpymax
(s, d, (SYSFS_PATH_MAX-strlen(devdir)));
+ safestr
cpymax
(target, devdir, len);
break;
case '/':
/* absolute path - copy as is */
break;
case '/':
/* absolute path - copy as is */
- safestr
ncpy
(target, linkpath, len);
+ safestr
cpymax
(target, linkpath, len);
break;
default:
/* relative path from this directory */
break;
default:
/* relative path from this directory */
@@
-257,7
+257,7
@@
parse_path:
} else {
safestrcpy(temp_path, linkpath);
}
} else {
safestrcpy(temp_path, linkpath);
}
- safestr
ncpy
(target, temp_path, len);
+ safestr
cpymax
(target, temp_path, len);
}
return 0;
}
}
return 0;
}
@@
-330,7
+330,7
@@
struct dlist *sysfs_open_subsystem_list(char *name)
dlist_for_each_data(dir->subdirs, cur,
struct sysfs_directory) {
subsys_name = (char *)calloc(1, SYSFS_NAME_LEN);
dlist_for_each_data(dir->subdirs, cur,
struct sysfs_directory) {
subsys_name = (char *)calloc(1, SYSFS_NAME_LEN);
- safestr
ncpy
(subsys_name, cur->name, SYSFS_NAME_LEN);
+ safestr
cpymax
(subsys_name, cur->name, SYSFS_NAME_LEN);
dlist_unshift_sorted(list, subsys_name, sort_char);
}
}
dlist_unshift_sorted(list, subsys_name, sort_char);
}
}
@@
-345,11
+345,11
@@
struct dlist *sysfs_open_subsystem_list(char *name)
if (c == NULL)
goto out;
*c = '\0';
if (c == NULL)
goto out;
*c = '\0';
- safestr
ncpy
(c, SYSFS_BLOCK_NAME,
+ safestr
cpymax
(c, SYSFS_BLOCK_NAME,
sizeof(sysfs_path) - strlen(sysfs_path));
if ((sysfs_path_is_dir(sysfs_path)) == 0) {
subsys_name = (char *)calloc(1, SYSFS_NAME_LEN);
sizeof(sysfs_path) - strlen(sysfs_path));
if ((sysfs_path_is_dir(sysfs_path)) == 0) {
subsys_name = (char *)calloc(1, SYSFS_NAME_LEN);
- safestr
ncpy
(subsys_name, SYSFS_BLOCK_NAME,
+ safestr
cpymax
(subsys_name, SYSFS_BLOCK_NAME,
SYSFS_NAME_LEN);
dlist_unshift_sorted(list, subsys_name, sort_char);
}
SYSFS_NAME_LEN);
dlist_unshift_sorted(list, subsys_name, sort_char);
}
@@
-409,7
+409,7
@@
struct dlist *sysfs_open_bus_devices_list(char *name)
dlist_for_each_data(dir->links, cur,
struct sysfs_link) {
device_name = (char *)calloc(1, SYSFS_NAME_LEN);
dlist_for_each_data(dir->links, cur,
struct sysfs_link) {
device_name = (char *)calloc(1, SYSFS_NAME_LEN);
- safestr
ncpy
(device_name, cur->name, SYSFS_NAME_LEN);
+ safestr
cpymax
(device_name, cur->name, SYSFS_NAME_LEN);
dlist_unshift_sorted(list, device_name, sort_char);
}
}
dlist_unshift_sorted(list, device_name, sort_char);
}
}