tequilaOS/platform_build_blueprint
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make WriteDepFile escape spaces and special characters

Browse source 
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
This commit is contained in:
Christian Zander 2015-01-12 11:37:17 -08:00 committed by Jamie Gennis
parent e28dbe4d0c
commit c4d07d8fb5
1 changed files with 17 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
deptools/depfile.go
View file

@ -20,6 +20,16 @@ import (
"strings" "strings"
) )
var (
pathEscaper = strings.NewReplacer(
`\`, `\\`,
` `, `\ `,
`#`, `\#`,
`*`, `\*`,
`[`, `\[`,
`|`, `\|`)
)
// WriteDepFile creates a new gcc-style depfile and populates it with content // WriteDepFile creates a new gcc-style depfile and populates it with content
// indicating that target depends on deps. // indicating that target depends on deps.
func WriteDepFile(filename, target string, deps []string) error { func WriteDepFile(filename, target string, deps []string) error {
@ -29,8 +39,14 @@ func WriteDepFile(filename, target string, deps []string) error {
} }
defer f.Close() 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, _, err = fmt.Fprintf(f, "%s: \\\n %s\n", target,
strings.Join(deps, " \\\n ")) strings.Join(escapedDeps, " \\\n "))
if err != nil { if err != nil {
return err return err
} }