static char *find_cgroup_mnt(struct thread_data *td)
{
char *mntpoint = NULL;
- struct mntent *mnt;
+ struct mntent *mnt, dummy;
+ char buf[256] = {0};
FILE *f;
f = setmntent("/proc/mounts", "r");
return NULL;
}
- while ((mnt = getmntent(f)) != NULL) {
+ while ((mnt = getmntent_r(f, &dummy, buf, sizeof(buf))) != NULL) {
if (!strcmp(mnt->mnt_type, "cgroup") &&
strstr(mnt->mnt_opts, "blkio"))
break;
char *str = malloc(64);
if (td->o.cgroup)
- sprintf(str, "%s/%s", mnt, td->o.cgroup);
+ sprintf(str, "%s%s%s", mnt, FIO_OS_PATH_SEPARATOR, td->o.cgroup);
else
- sprintf(str, "%s/%s", mnt, td->o.name);
+ sprintf(str, "%s%s%s", mnt, FIO_OS_PATH_SEPARATOR, td->o.name);
return str;
}
{
char tmp[256];
FILE *f;
-
- sprintf(tmp, "%s/%s", path, filename);
+
+ sprintf(tmp, "%s%s%s", path, FIO_OS_PATH_SEPARATOR, filename);
f = fopen(tmp, "w");
if (!f) {
td_verror(td, errno, onerr);