From dbdcef5166b37e0a1e991e27c82a24c249c83b33 Mon Sep 17 00:00:00 2001
From: Lukas Neubert <serkonda@protonmail.com>
Date: Mon, 16 Nov 2020 18:26:44 +0100
Subject: [PATCH] quote_path: also quote ampersands (#6846)

---
 cmd/tools/vfmt.v   |  2 +-
 vlib/v/util/util.v | 18 +++++++++++-------
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/cmd/tools/vfmt.v b/cmd/tools/vfmt.v
index 87be6dc6f7..4ff8c16809 100644
--- a/cmd/tools/vfmt.v
+++ b/cmd/tools/vfmt.v
@@ -113,7 +113,7 @@ fn main() {
 	for file in files {
 		fpath := os.real_path(file)
 		mut worker_command_array := cli_args_no_files.clone()
-		worker_command_array << ['-worker', util.quote_path_with_spaces(fpath)]
+		worker_command_array << ['-worker', util.quote_path(fpath)]
 		worker_cmd := worker_command_array.join(' ')
 		if foptions.is_verbose {
 			eprintln('vfmt worker_cmd: $worker_cmd')
diff --git a/vlib/v/util/util.v b/vlib/v/util/util.v
index 1e855c46e0..6b518056ed 100644
--- a/vlib/v/util/util.v
+++ b/vlib/v/util/util.v
@@ -126,7 +126,7 @@ pub fn launch_tool(is_verbose bool, tool_name string, args []string) {
 	vexe := pref.vexe_path()
 	vroot := os.dir(vexe)
 	set_vroot_folder(vroot)
-	tool_args := args_quote_paths_with_spaces(args)
+	tool_args := args_quote_paths(args)
 	tool_basename := os.real_path(os.join_path(vroot, 'cmd', 'tools', tool_name))
 	tool_exe := path_of_executable(tool_basename)
 	tool_source := tool_basename + '.v'
@@ -200,17 +200,21 @@ pub fn should_recompile_tool(vexe string, tool_source string) bool {
 	return should_compile
 }
 
-pub fn quote_path_with_spaces(s string) string {
-	if s.contains(' ') {
-		return '"$s"'
+pub fn quote_path(s string) string {
+	mut qs := s
+	if qs.contains('&') {
+		qs = qs.replace('&', '\\&')
 	}
-	return s
+	if qs.contains(' ') {
+		return '"$qs"'
+	}
+	return qs
 }
 
-pub fn args_quote_paths_with_spaces(args []string) string {
+pub fn args_quote_paths(args []string) string {
 	mut res := []string{}
 	for a in args {
-		res << quote_path_with_spaces(a)
+		res << quote_path(a)
 	}
 	return res.join(' ')
 }