diff --git a/cmd/geth/js.go b/cmd/geth/js.go index 69c03f4c40..729cc2fd71 100644 --- a/cmd/geth/js.go +++ b/cmd/geth/js.go @@ -41,7 +41,6 @@ import ( ) var ( - leadingSpace = regexp.MustCompile("^ ") passwordRegexp = regexp.MustCompile("personal.[nus]") onlyws = regexp.MustCompile("^\\s*$") exit = regexp.MustCompile("^\\s*exit\\s*;*\\s*$") @@ -361,7 +360,7 @@ func (self *jsre) interactive() { str += input + "\n" self.setIndent() if indentCount <= 0 { - if mustLogInHistory(str) { + if !excludeFromHistory(str) { utils.Stdin.AppendHistory(str[:len(str)-1]) } self.parseInput(str) @@ -371,10 +370,8 @@ func (self *jsre) interactive() { } } -func mustLogInHistory(input string) bool { - return len(input) == 0 || - passwordRegexp.MatchString(input) || - !leadingSpace.MatchString(input) +func excludeFromHistory(input string) bool { + return len(input) == 0 || input[0] == ' ' || passwordRegexp.MatchString(input) } func (self *jsre) withHistory(datadir string, op func(*os.File)) {