vbatts/go-mtree
1
0
Fork 0
Code Issues Pull requests Releases Activity

Merge pull request #65 from vbatts/stdin_tar

Browse source 
gomtree: allow tar from stdin
This commit is contained in:
Vincent Batts 2016-08-11 14:12:10 -04:00 committed by GitHub
commit 97a2505b8b
1 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
cmd/gomtree/main.go
View file

@ -22,7 +22,7 @@ var (
flUseKeywords = flag.String("k", "", "Use the specified (delimited by comma or space) keywords as the current set of keywords") flUseKeywords = flag.String("k", "", "Use the specified (delimited by comma or space) keywords as the current set of keywords")
flListKeywords = flag.Bool("list-keywords", false, "List the keywords available") flListKeywords = flag.Bool("list-keywords", false, "List the keywords available")
flResultFormat = flag.String("result-format", "bsd", "output the validation results using the given format (bsd, json, path)") flResultFormat = flag.String("result-format", "bsd", "output the validation results using the given format (bsd, json, path)")
flTar = flag.String("T", "", "use tar archive to create or validate a directory hierarchy spec") flTar = flag.String("T", "", "use tar archive to create or validate a directory hierarchy spec (\"-\" indicates stdin)")
flBsdKeywords = flag.Bool("bsd-keywords", false, "only operate on keywords that are supported by upstream mtree(8)") flBsdKeywords = flag.Bool("bsd-keywords", false, "only operate on keywords that are supported by upstream mtree(8)")
flListUsedKeywords = flag.Bool("list-used", false, "list all the keywords found in a validation manifest") flListUsedKeywords = flag.Bool("list-used", false, "list all the keywords found in a validation manifest")
flDebug = flag.Bool("debug", false, "output debug info to STDERR") flDebug = flag.Bool("debug", false, "output debug info to STDERR")
@ -184,13 +184,20 @@ func main() {
// -T <tar file> // -T <tar file>
var tdh *mtree.DirectoryHierarchy var tdh *mtree.DirectoryHierarchy
if *flTar != "" { if *flTar != "" {
var input io.Reader
if *flTar == "-" {
input = os.Stdin
} else {
fh, err := os.Open(*flTar) fh, err := os.Open(*flTar)
if err != nil { if err != nil {
log.Println(err) log.Println(err)
isErr = true isErr = true
return return
} }
ts := mtree.NewTarStreamer(fh, currentKeywords) defer fh.Close()
input = fh
}
ts := mtree.NewTarStreamer(input, currentKeywords)
if _, err := io.Copy(ioutil.Discard, ts); err != nil && err != io.EOF { if _, err := io.Copy(ioutil.Discard, ts); err != nil && err != io.EOF {
log.Println(err) log.Println(err)
@ -202,7 +209,7 @@ func main() {
isErr = true isErr = true
return return
} }
defer fh.Close() var err error
tdh, err = ts.Hierarchy() tdh, err = ts.Hierarchy()
if err != nil { if err != nil {
log.Println(err) log.Println(err)