diff --git a/cmd/wireformat/wireformat.go b/cmd/wireformat/wireformat.go index d5e6d67..897d55a 100644 --- a/cmd/wireformat/wireformat.go +++ b/cmd/wireformat/wireformat.go @@ -9,6 +9,8 @@ import ( "os" "strings" + check "antoine-roux.ml/projects/go/dns-tools/internal" + "github.com/miekg/dns" ) @@ -24,26 +26,20 @@ func main() { var err error if *file != "" { if *file == "-" { - *file = "/dev/stdin" + *file = os.Stdin.Name() } body, err = ioutil.ReadFile(*file) - if err != nil { - log.Fatalln(err) - } + check.Check(err) msg := &dns.Msg{} err = msg.Unpack(body) - if err != nil { - log.Fatalln(err) - } + check.Check(err) log.Println(msg) } else if *domainToResolve != "" { if *domainToResolve == "-" { - readDomainToResolve, err := ioutil.ReadFile("/dev/stdin") - if err != nil { - log.Fatalln(err) - } + readDomainToResolve, err := ioutil.ReadFile(os.Stdin.Name()) + check.Check(err) *domainToResolve = strings.TrimSuffix(string(readDomainToResolve), "\n") } msg := &dns.Msg{ @@ -56,9 +52,7 @@ func main() { }, } b, err := msg.Pack() - if err != nil { - log.Fatalln(err) - } + check.Check(err) binary.Write(os.Stdout, binary.LittleEndian, b) } else { log.Println(errors.New("Too few argument pass")) diff --git a/go.mod b/go.mod index f1be4bc..dfa80bd 100644 --- a/go.mod +++ b/go.mod @@ -3,3 +3,5 @@ module antoine-roux.ml/projects/go/dns-tools go 1.15 require github.com/miekg/dns v1.1.35 + +replace antoine-roux.ml/projects/go/dns-tools/internal => ./internal diff --git a/internal/check.go b/internal/check.go new file mode 100644 index 0000000..da4cd9a --- /dev/null +++ b/internal/check.go @@ -0,0 +1,9 @@ +package check + +import "log" + +func Check(err error) { + if err != nil { + log.Fatalln(err) + } +}