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

Refactor in preparation to detect when stdout is the input file

Browse source 
Test: bpfmt -d Android.bp
Bug: 67326589

Change-Id: I5cd57a784848f70c7a1306161c40faa8e79cd44e
This commit is contained in:
Jeff Gaston 2017-10-05 19:46:15 -07:00
parent 5fa3f89f2c
commit 6cd6ebc768
1 changed files with 23 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
bpfmt/bpfmt.go
View file

@ -9,12 +9,13 @@ import (
"bytes"
"flag"
"fmt"
"github.com/google/blueprint/parser"
"io"
"io/ioutil"
"os"
"os/exec"
"path/filepath"
"github.com/google/blueprint/parser"
)
var (
@ -40,17 +41,17 @@ func usage() {
os.Exit(2)
}
// If in == nil, the source is the contents of the file with the given filename.
func processFile(filename string, in io.Reader, out io.Writer) error {
if in == nil {
func processFile(filename string, out io.Writer) error {
f, err := os.Open(filename)
if err != nil {
return err
}
defer f.Close()
in = f
}
return processReader(filename, f, out)
}
func processReader(filename string, in io.Reader, out io.Writer) error {
src, err := ioutil.ReadAll(in)
if err != nil {
return err
@ -103,17 +104,17 @@ func processFile(filename string, in io.Reader, out io.Writer) error {
return err
}
func visitFile(path string, f os.FileInfo, err error) error {
func walkDir(path string) {
visitFile := func(path string, f os.FileInfo, err error) error {
if err == nil && f.Name() == "Blueprints" {
err = processFile(path, nil, os.Stdout)
err = processFile(path, os.Stdout)
}
if err != nil {
report(err)
}
return nil
}
}
func walkDir(path string) {
filepath.Walk(path, visitFile)
}
@ -126,7 +127,7 @@ func main() {
exitCode = 2
return
}
if err := processFile("<standard input>", os.Stdin, os.Stdout); err != nil {
if err := processReader("<standard input>", os.Stdin, os.Stdout); err != nil {
report(err)
}
return
@ -140,7 +141,7 @@ func main() {
case dir.IsDir():
walkDir(path)
default:
if err := processFile(path, nil, os.Stdout); err != nil {
if err := processFile(path, os.Stdout); err != nil {
report(err)
}
}