From e531fb203aedeb3863ebf8add0bbd8251183d27a Mon Sep 17 00:00:00 2001
From: Oleg Endo <olegendo@gcc.gnu.org>
Date: Mon, 29 Apr 2019 16:13:34 +0900
Subject: [PATCH 1/2] escape spaces with backslash when writing dep file

filenames are sparated by spaces in the dep file.  if a filename in the
dep file contains spaces they must be escaped, otherwise the tool that
reads the dep file will see multiple wrong filenames.
---
 kernel/driver.cc |  4 ++--
 kernel/yosys.cc  | 14 ++++++++++++++
 kernel/yosys.h   |  1 +
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/kernel/driver.cc b/kernel/driver.cc
index 1bc7a5935..8c56d059b 100644
--- a/kernel/driver.cc
+++ b/kernel/driver.cc
@@ -529,13 +529,13 @@ int main(int argc, char **argv)
 			log_error("Can't open dependencies file for writing: %s\n", strerror(errno));
 		bool first = true;
 		for (auto fn : yosys_output_files) {
-			fprintf(f, "%s%s", first ? "" : " ", fn.c_str());
+			fprintf(f, "%s%s", first ? "" : " ", escape_filename_spaces (fn).c_str());
 			first = false;
 		}
 		fprintf(f, ":");
 		for (auto fn : yosys_input_files) {
 			if (yosys_output_files.count(fn) == 0)
-				fprintf(f, " %s", fn.c_str());
+				fprintf(f, " %s", escape_filename_spaces (fn).c_str());
 		}
 		fprintf(f, "\n");
 	}
diff --git a/kernel/yosys.cc b/kernel/yosys.cc
index a12355f1d..267a7d01c 100644
--- a/kernel/yosys.cc
+++ b/kernel/yosys.cc
@@ -482,6 +482,20 @@ void remove_directory(std::string dirname)
 #endif
 }
 
+std::string escape_filename_spaces (const std::string& filename)
+{
+  std::string out;
+  out.reserve (filename.size ());
+  for (auto c : filename)
+  {
+    if (c == ' ')
+      out += "\\ ";
+    else
+      out.push_back (c);
+  }
+  return out;
+}
+
 int GetSize(RTLIL::Wire *wire)
 {
 	return wire->width;
diff --git a/kernel/yosys.h b/kernel/yosys.h
index 2cf6188b4..d64904151 100644
--- a/kernel/yosys.h
+++ b/kernel/yosys.h
@@ -257,6 +257,7 @@ std::string make_temp_dir(std::string template_str = "/tmp/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);
+std::string escape_filename_spaces (const std::string& filename);
 
 template<typename T> int GetSize(const T &obj) { return obj.size(); }
 int GetSize(RTLIL::Wire *wire);

From 4f15e7f00fa2b073d6df39d4af7171f2a3f07bc9 Mon Sep 17 00:00:00 2001
From: Oleg Endo <olegendo@gcc.gnu.org>
Date: Mon, 29 Apr 2019 19:20:33 +0900
Subject: [PATCH 2/2] fix codestyle formatting

---
 kernel/driver.cc |  4 ++--
 kernel/yosys.cc  | 22 +++++++++++-----------
 kernel/yosys.h   |  2 +-
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/kernel/driver.cc b/kernel/driver.cc
index 8c56d059b..f273057dd 100644
--- a/kernel/driver.cc
+++ b/kernel/driver.cc
@@ -529,13 +529,13 @@ int main(int argc, char **argv)
 			log_error("Can't open dependencies file for writing: %s\n", strerror(errno));
 		bool first = true;
 		for (auto fn : yosys_output_files) {
-			fprintf(f, "%s%s", first ? "" : " ", escape_filename_spaces (fn).c_str());
+			fprintf(f, "%s%s", first ? "" : " ", escape_filename_spaces(fn).c_str());
 			first = false;
 		}
 		fprintf(f, ":");
 		for (auto fn : yosys_input_files) {
 			if (yosys_output_files.count(fn) == 0)
-				fprintf(f, " %s", escape_filename_spaces (fn).c_str());
+				fprintf(f, " %s", escape_filename_spaces(fn).c_str());
 		}
 		fprintf(f, "\n");
 	}
diff --git a/kernel/yosys.cc b/kernel/yosys.cc
index 267a7d01c..20d972150 100644
--- a/kernel/yosys.cc
+++ b/kernel/yosys.cc
@@ -482,18 +482,18 @@ void remove_directory(std::string dirname)
 #endif
 }
 
-std::string escape_filename_spaces (const std::string& filename)
+std::string escape_filename_spaces(const std::string& filename)
 {
-  std::string out;
-  out.reserve (filename.size ());
-  for (auto c : filename)
-  {
-    if (c == ' ')
-      out += "\\ ";
-    else
-      out.push_back (c);
-  }
-  return out;
+	std::string out;
+	out.reserve(filename.size());
+	for (auto c : filename)
+	{
+		if (c == ' ')
+			out += "\\ ";
+		else
+			out.push_back(c);
+	}
+	return out;
 }
 
 int GetSize(RTLIL::Wire *wire)
diff --git a/kernel/yosys.h b/kernel/yosys.h
index d64904151..82eb069ab 100644
--- a/kernel/yosys.h
+++ b/kernel/yosys.h
@@ -257,7 +257,7 @@ std::string make_temp_dir(std::string template_str = "/tmp/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);
-std::string escape_filename_spaces (const std::string& filename);
+std::string escape_filename_spaces(const std::string& filename);
 
 template<typename T> int GetSize(const T &obj) { return obj.size(); }
 int GetSize(RTLIL::Wire *wire);