Special diff output + debugger changes

2 files changed, 10 insertions, 0 deletions

diff --git a/ethereum/flags.go b/ethereum/flags.go
index d5a9c3a8a..af0fd9a69 100644
--- a/ethereum/flags.go
+++ b/ethereum/flags.go
@@ -11,6 +11,7 @@ import (
 
 var Identifier string
 var KeyRing string
+var DiffTool bool
 var KeyStore string
 var StartRpc bool
 var RpcPort int
@@ -66,6 +67,7 @@ func Init() {
 	flag.StringVar(&ConfigFile, "conf", defaultConfigFile, "config file")
 	flag.StringVar(&DebugFile, "debug", "", "debug file (no debugging if not set)")
 	flag.IntVar(&LogLevel, "loglevel", int(ethlog.InfoLevel), "loglevel: 0-5: silent,error,warn,info,debug,debug detail)")
+	flag.BoolVar(&DiffTool, "difftool", false, "creates output for diff'ing. Sets LogLevel=0")
 
 	flag.BoolVar(&StartMining, "mine", false, "start dagger mining")
 	flag.BoolVar(&StartJsConsole, "js", false, "launches javascript console")
diff --git a/ethereum/main.go b/ethereum/main.go
index e4d73d494..39226c1d2 100644
--- a/ethereum/main.go
+++ b/ethereum/main.go
@@ -2,6 +2,7 @@ package main
 
 import (
 	"github.com/ethereum/eth-go/ethlog"
+	"github.com/ethereum/eth-go/ethutil"
 	"github.com/ethereum/go-ethereum/utils"
 	"runtime"
 )
@@ -20,7 +21,14 @@ func main() {
 
 	// precedence: code-internal flag default < config file < environment variables < command line
 	Init() // parsing command line
+
+	// If the difftool option is selected ignore all other log output
+	if DiffTool {
+		LogLevel = 0
+	}
+
 	utils.InitConfig(ConfigFile, Datadir, "ETH")
+	ethutil.Config.Diff = DiffTool
 
 	utils.InitDataDir(Datadir)