From 1822be8792865e3f6f0765693f93b8e85fcb279f Mon Sep 17 00:00:00 2001
From: "Mohamed A. Bamakhrama" <mohamed@alumni.tum.de>
Date: Mon, 23 May 2022 22:21:45 +0200
Subject: Observe $TMPDIR variable when creating tmp files

POSIX defines $TMPDIR as containing the pathname of the directory where
programs can create temporary files. On most systems, this variable points to
"/tmp". However, on some systems it can point to a different location.
Without respecting this variable, yosys fails to run on such systems.

Signed-off-by: Mohamed A. Bamakhrama <mohamed@alumni.tum.de>
---
 kernel/fstdata.cc |  2 +-
 kernel/yosys.cc   | 31 ++++++++++++++++++++++++++++++-
 kernel/yosys.h    |  5 +++--
 3 files changed, 34 insertions(+), 4 deletions(-)

(limited to 'kernel')

diff --git a/kernel/fstdata.cc b/kernel/fstdata.cc
index fea8ee3c3..b2e574b02 100644
--- a/kernel/fstdata.cc
+++ b/kernel/fstdata.cc
@@ -33,7 +33,7 @@ FstData::FstData(std::string filename) : ctx(nullptr)
 	std::string filename_trim = file_base_name(filename);
 	if (filename_trim.size() > 4 && filename_trim.compare(filename_trim.size()-4, std::string::npos, ".vcd") == 0) {
 		filename_trim.erase(filename_trim.size()-4);
-		tmp_file = stringf("/tmp/converted_%s.fst", filename_trim.c_str());
+		tmp_file = stringf("%s/converted_%s.fst", get_base_tmpdir().c_str(), filename_trim.c_str());
 		std::string cmd = stringf("vcd2fst %s %s", filename.c_str(), tmp_file.c_str());
 		log("Exec: %s\n", cmd.c_str());
 		if (run_command(cmd) != 0)
diff --git a/kernel/yosys.cc b/kernel/yosys.cc
index 4e1a3ca7e..7f395761b 100644
--- a/kernel/yosys.cc
+++ b/kernel/yosys.cc
@@ -376,6 +376,35 @@ int run_command(const std::string &command, std::function<void(const std::string
 }
 #endif
 
+// POSIX defines `TMPDIR` as the pathname of the directory
+// where programs can create temporary files. On most systems,
+// it points to '/tmp'. However, on some systems it can be a different
+// location
+// Source: https://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap08.html#tag_08_03
+std::string get_base_tmpdir()
+{
+	// We cache the directory name in a static variable here
+	// for faster calls later
+	static std::string tmpdir;
+
+	if (!tmpdir.empty()) {
+		return tmpdir;
+	}
+
+	char * var = std::getenv("TMPDIR");
+	if (NULL == var) {
+		// if the variable is not set, then use '/tmp'
+		tmpdir.assign("/tmp");
+	} else {
+		tmpdir.assign(var);
+		// We return the directory name without the trailing '/'
+		if (tmpdir.back() == '/') {
+			tmpdir.pop_back();
+		}
+	}
+	return tmpdir;
+}
+
 std::string make_temp_file(std::string template_str)
 {
 #if defined(__wasm)
@@ -384,7 +413,7 @@ std::string make_temp_file(std::string template_str)
 	static size_t index = 0;
 	template_str.replace(pos, 6, stringf("%06zu", index++));
 #elif defined(_WIN32)
-	if (template_str.rfind("/tmp/", 0) == 0) {
+	if (template_str.rfind(get_base_tmpdir() + "/", 0) == 0) {
 #  ifdef __MINGW32__
 		char longpath[MAX_PATH + 1];
 		char shortpath[MAX_PATH + 1];
diff --git a/kernel/yosys.h b/kernel/yosys.h
index 93e7ff23e..448f896d4 100644
--- a/kernel/yosys.h
+++ b/kernel/yosys.h
@@ -278,8 +278,9 @@ bool patmatch(const char *pattern, const char *string);
 #if !defined(YOSYS_DISABLE_SPAWN)
 int run_command(const std::string &command, std::function<void(const std::string&)> process_line = std::function<void(const std::string&)>());
 #endif
-std::string make_temp_file(std::string template_str = "/tmp/yosys_XXXXXX");
-std::string make_temp_dir(std::string template_str = "/tmp/yosys_XXXXXX");
+std::string get_base_tmpdir();
+std::string make_temp_file(std::string template_str = get_base_tmpdir() + "/yosys_XXXXXX");
+std::string make_temp_dir(std::string template_str = get_base_tmpdir() + "/yosys_XXXXXX");
 bool check_file_exists(std::string filename, bool is_exec = false);
 bool is_absolute_path(std::string filename);
 void remove_directory(std::string dirname);
-- 
cgit v1.2.3


From 08275a1569af7d925ff28ff0288d9779057d27a9 Mon Sep 17 00:00:00 2001
From: Miodrag Milanovic <mmicko@gmail.com>
Date: Fri, 27 May 2022 16:13:55 +0200
Subject: Cleanup, and fix windows

---
 kernel/yosys.cc | 61 +++++++++++++++++++++++----------------------------------
 1 file changed, 24 insertions(+), 37 deletions(-)

(limited to 'kernel')

diff --git a/kernel/yosys.cc b/kernel/yosys.cc
index 7f395761b..64d2b4def 100644
--- a/kernel/yosys.cc
+++ b/kernel/yosys.cc
@@ -376,64 +376,54 @@ int run_command(const std::string &command, std::function<void(const std::string
 }
 #endif
 
-// POSIX defines `TMPDIR` as the pathname of the directory
-// where programs can create temporary files. On most systems,
-// it points to '/tmp'. However, on some systems it can be a different
-// location
-// Source: https://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap08.html#tag_08_03
 std::string get_base_tmpdir()
 {
-	// We cache the directory name in a static variable here
-	// for faster calls later
 	static std::string tmpdir;
 
 	if (!tmpdir.empty()) {
 		return tmpdir;
 	}
 
+#if defined(_WIN32)
+#  ifdef __MINGW32__
+	char longpath[MAX_PATH + 1];
+	char shortpath[MAX_PATH + 1];
+#  else
+	WCHAR longpath[MAX_PATH + 1];
+	TCHAR shortpath[MAX_PATH + 1];
+#  endif
+	if (!GetTempPath(MAX_PATH+1, longpath))
+		log_error("GetTempPath() failed.\n");
+	if (!GetShortPathName(longpath, shortpath, MAX_PATH + 1))
+		log_error("GetShortPathName() failed.\n");
+	for (int i = 0; shortpath[i]; i++)
+		tmpdir += char(shortpath[i]);
+#else
 	char * var = std::getenv("TMPDIR");
-	if (NULL == var) {
-		// if the variable is not set, then use '/tmp'
-		tmpdir.assign("/tmp");
-	} else {
+	if (var && strlen(var)!=0) {
 		tmpdir.assign(var);
 		// We return the directory name without the trailing '/'
-		if (tmpdir.back() == '/') {
+		while (!tmpdir.empty() && (tmpdir.back() == '/')) {
 			tmpdir.pop_back();
 		}
+	} else {
+		tmpdir.assign("/tmp");
 	}
+#endif
 	return tmpdir;
 }
 
 std::string make_temp_file(std::string template_str)
 {
-#if defined(__wasm)
 	size_t pos = template_str.rfind("XXXXXX");
 	log_assert(pos != std::string::npos);
+#if defined(__wasm)
 	static size_t index = 0;
 	template_str.replace(pos, 6, stringf("%06zu", index++));
 #elif defined(_WIN32)
-	if (template_str.rfind(get_base_tmpdir() + "/", 0) == 0) {
-#  ifdef __MINGW32__
-		char longpath[MAX_PATH + 1];
-		char shortpath[MAX_PATH + 1];
-#  else
-		WCHAR longpath[MAX_PATH + 1];
-		TCHAR shortpath[MAX_PATH + 1];
-#  endif
-		if (!GetTempPath(MAX_PATH+1, longpath))
-			log_error("GetTempPath() failed.\n");
-		if (!GetShortPathName(longpath, shortpath, MAX_PATH + 1))
-			log_error("GetShortPathName() failed.\n");
-		std::string path;
-		for (int i = 0; shortpath[i]; i++)
-			path += char(shortpath[i]);
-		template_str = stringf("%s\\%s", path.c_str(), template_str.c_str() + 5);
-	}
-
-	size_t pos = template_str.rfind("XXXXXX");
-	log_assert(pos != std::string::npos);
-
+#ifndef YOSYS_WIN32_UNIX_DIR
+	std::replace(template_str.begin(), template_str.end(), '/', '\\');
+#endif
 	while (1) {
 		for (int i = 0; i < 6; i++) {
 			static std::string y = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
@@ -445,9 +435,6 @@ std::string make_temp_file(std::string template_str)
 			break;
 	}
 #else
-	size_t pos = template_str.rfind("XXXXXX");
-	log_assert(pos != std::string::npos);
-
 	int suffixlen = GetSize(template_str) - pos - 6;
 
 	char *p = strdup(template_str.c_str());
-- 
cgit v1.2.3