From: Josef Bacik <jbacik@fb.com>
Date: Wed, 11 Oct 2017 20:15:18 +0000 (-0400)
Subject: use mkdir instead of mkdirat
X-Git-Tag: fio-3.2~35
X-Git-Url: https://git.kernel.dk/?p=fio.git;a=commitdiff_plain;h=0b801f22a706e0f18e7d74cb2940e3948ed0efcf;ds=sidebyside

use mkdir instead of mkdirat

Windows doesn't have a way to do mkdirat, so convert to mkdir instead.

Signed-off-by: Josef Bacik <jbacik@fb.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
---

diff --git a/filesetup.c b/filesetup.c
index b390caa2..0dd3809b 100644
--- a/filesetup.c
+++ b/filesetup.c
@@ -1523,43 +1523,36 @@ bool exists_and_not_regfile(const char *filename)
 	return true;
 }
 
-static void create_work_dirs(struct thread_data *td, const char *fname)
+static int create_work_dirs(struct thread_data *td, const char *fname)
 {
 	char path[PATH_MAX];
 	char *start, *end;
-	int dirfd;
-	bool need_close = true;
 
 	if (td->o.directory) {
-		dirfd = open(td->o.directory, O_DIRECTORY | O_RDONLY);
-		if (dirfd < 0) {
-			log_err("fio: failed to open dir (%s): %d\n",
-				td->o.directory, errno);
-			assert(0);
-		}
+		snprintf(path, PATH_MAX, "%s%c%s", td->o.directory,
+			 FIO_OS_PATH_SEPARATOR, fname);
+		start = strstr(path, fname);
 	} else {
-		dirfd = AT_FDCWD;
-		need_close = false;
+		snprintf(path, PATH_MAX, "%s", fname);
+		start = path;
 	}
 
-	memcpy(path, fname, PATH_MAX);
-	start = end = path;
+	end = start;
 	while ((end = strchr(end, FIO_OS_PATH_SEPARATOR)) != NULL) {
 		if (end == start)
 			break;
 		*end = '\0';
 		errno = 0;
-		if (mkdirat(dirfd, start, 0600) && errno != EEXIST) {
+		if (mkdir(path, 0600) && errno != EEXIST) {
 			log_err("fio: failed to create dir (%s): %d\n",
 				start, errno);
-			assert(0);
+			return 1;
 		}
 		*end = FIO_OS_PATH_SEPARATOR;
 		end++;
 	}
-	if (need_close)
-		close(dirfd);
 	td->flags |= TD_F_DIRS_CREATED;
+	return 0;
 }
 
 int add_file(struct thread_data *td, const char *fname, int numjob, int inc)
@@ -1578,8 +1571,9 @@ int add_file(struct thread_data *td, const char *fname, int numjob, int inc)
 	sprintf(file_name + len, "%s", fname);
 
 	if (strchr(fname, FIO_OS_PATH_SEPARATOR) &&
-	    !(td->flags & TD_F_DIRS_CREATED))
-		create_work_dirs(td, fname);
+	    !(td->flags & TD_F_DIRS_CREATED) &&
+	    create_work_dirs(td, fname))
+		return 1;
 
 	/* clean cloned siblings using existing files */
 	if (numjob && is_already_allocated(file_name) &&