From c4d07d8fb530e724a8960d9e70bc93632818f9c2 Mon Sep 17 00:00:00 2001 From: Christian Zander Date: Mon, 12 Jan 2015 11:37:17 -0800 Subject: [PATCH] Make WriteDepFile escape spaces and special characters This commit makes deptools.WriteDepFile() escape spaces and the following set of special characters in the dependencies it writes to files used as Ninja depfiles: \, #, *, [, |. Without this change, dependencies with paths including any of the above may not function as intended. Change-Id: I3560a34de930932422200985fb479515a21d9508 --- deptools/depfile.go | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/deptools/depfile.go b/deptools/depfile.go index cc114f6..bfcf2ce 100644 --- a/deptools/depfile.go +++ b/deptools/depfile.go @@ -20,6 +20,16 @@ import ( "strings" ) +var ( + pathEscaper = strings.NewReplacer( + `\`, `\\`, + ` `, `\ `, + `#`, `\#`, + `*`, `\*`, + `[`, `\[`, + `|`, `\|`) +) + // WriteDepFile creates a new gcc-style depfile and populates it with content // indicating that target depends on deps. func WriteDepFile(filename, target string, deps []string) error { @@ -29,8 +39,14 @@ func WriteDepFile(filename, target string, deps []string) error { } defer f.Close() + var escapedDeps []string + + for _, dep := range deps { + escapedDeps = append(escapedDeps, pathEscaper.Replace(dep)) + } + _, err = fmt.Fprintf(f, "%s: \\\n %s\n", target, - strings.Join(deps, " \\\n ")) + strings.Join(escapedDeps, " \\\n ")) if err != nil { return err }