From fb889216eded6ecaace1a161015719cd20041421 Mon Sep 17 00:00:00 2001 From: Sean Darcy Date: Tue, 18 Dec 2018 04:17:16 +0000 Subject: [PATCH 1/2] Changed dumpConfig function to optionally save to file --- cmd/geth/config.go | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/cmd/geth/config.go b/cmd/geth/config.go index 59f759f0eaa2..936944ad35d1 100644 --- a/cmd/geth/config.go +++ b/cmd/geth/config.go @@ -198,7 +198,19 @@ func dumpConfig(ctx *cli.Context) error { if err != nil { return err } - io.WriteString(os.Stdout, comment) - os.Stdout.Write(out) + + if ctx.NArg() > 0 { + f, err := os.OpenFile(ctx.Args().Get(0), os.O_RDWR|os.O_CREATE, 0644) + if err != nil { + return err + } + defer f.Close() + f.WriteString(comment) + f.Write(out) + } else { + io.WriteString(os.Stdout, comment) + os.Stdout.Write(out) + } + return nil } From 66ed44061c2449ca95984fc906439a11a00d18f6 Mon Sep 17 00:00:00 2001 From: Sean Darcy Date: Mon, 7 Jan 2019 03:24:30 +0000 Subject: [PATCH 2/2] Added O_TRUNC flag to file open and cleaned up code --- cmd/geth/config.go | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/cmd/geth/config.go b/cmd/geth/config.go index 936944ad35d1..f1e2811966b0 100644 --- a/cmd/geth/config.go +++ b/cmd/geth/config.go @@ -20,7 +20,6 @@ import ( "bufio" "errors" "fmt" - "io" "math/big" "os" "reflect" @@ -199,18 +198,16 @@ func dumpConfig(ctx *cli.Context) error { return err } + dump := os.Stdout if ctx.NArg() > 0 { - f, err := os.OpenFile(ctx.Args().Get(0), os.O_RDWR|os.O_CREATE, 0644) + dump, err = os.OpenFile(ctx.Args().Get(0), os.O_RDWR|os.O_CREATE|os.O_TRUNC, 0644) if err != nil { return err } - defer f.Close() - f.WriteString(comment) - f.Write(out) - } else { - io.WriteString(os.Stdout, comment) - os.Stdout.Write(out) + defer dump.Close() } + dump.WriteString(comment) + dump.Write(out) return nil }