Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
whqwjb
go-ethereum
提交
27528ad3
G
go-ethereum
项目概览
whqwjb
/
go-ethereum
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
go-ethereum
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
27528ad3
编写于
10月 07, 2015
作者:
J
Jeffrey Wilcke
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #1851 from bas-vk/historyfile
console/history respect datadir
上级
f8786def
8636f0e1
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
7 addition
and
11 deletion
+7
-11
cmd/geth/js.go
cmd/geth/js.go
+6
-11
cmd/geth/main.go
cmd/geth/main.go
+1
-0
未找到文件。
cmd/geth/js.go
浏览文件 @
27528ad3
...
...
@@ -145,7 +145,7 @@ func apiWordCompleter(line string, pos int) (head string, completions []string,
return
begin
,
completionWords
,
end
}
func
newLightweightJSRE
(
libPath
string
,
client
comms
.
EthereumClient
,
interactive
bool
)
*
jsre
{
func
newLightweightJSRE
(
libPath
string
,
client
comms
.
EthereumClient
,
datadir
string
,
interactive
bool
)
*
jsre
{
js
:=
&
jsre
{
ps1
:
"> "
}
js
.
wait
=
make
(
chan
*
big
.
Int
)
js
.
client
=
client
...
...
@@ -161,14 +161,14 @@ func newLightweightJSRE(libPath string, client comms.EthereumClient, interactive
js
.
prompter
=
dumbterm
{
bufio
.
NewReader
(
os
.
Stdin
)}
}
else
{
lr
:=
liner
.
NewLiner
()
js
.
withHistory
(
func
(
hist
*
os
.
File
)
{
lr
.
ReadHistory
(
hist
)
})
js
.
withHistory
(
datadir
,
func
(
hist
*
os
.
File
)
{
lr
.
ReadHistory
(
hist
)
})
lr
.
SetCtrlCAborts
(
true
)
js
.
loadAutoCompletion
()
lr
.
SetWordCompleter
(
apiWordCompleter
)
lr
.
SetTabCompletionStyle
(
liner
.
TabPrints
)
js
.
prompter
=
lr
js
.
atexit
=
func
()
{
js
.
withHistory
(
func
(
hist
*
os
.
File
)
{
hist
.
Truncate
(
0
);
lr
.
WriteHistory
(
hist
)
})
js
.
withHistory
(
datadir
,
func
(
hist
*
os
.
File
)
{
hist
.
Truncate
(
0
);
lr
.
WriteHistory
(
hist
)
})
lr
.
Close
()
close
(
js
.
wait
)
}
...
...
@@ -203,14 +203,14 @@ func newJSRE(ethereum *eth.Ethereum, libPath, corsDomain string, client comms.Et
js
.
prompter
=
dumbterm
{
bufio
.
NewReader
(
os
.
Stdin
)}
}
else
{
lr
:=
liner
.
NewLiner
()
js
.
withHistory
(
func
(
hist
*
os
.
File
)
{
lr
.
ReadHistory
(
hist
)
})
js
.
withHistory
(
ethereum
.
DataDir
,
func
(
hist
*
os
.
File
)
{
lr
.
ReadHistory
(
hist
)
})
lr
.
SetCtrlCAborts
(
true
)
js
.
loadAutoCompletion
()
lr
.
SetWordCompleter
(
apiWordCompleter
)
lr
.
SetTabCompletionStyle
(
liner
.
TabPrints
)
js
.
prompter
=
lr
js
.
atexit
=
func
()
{
js
.
withHistory
(
func
(
hist
*
os
.
File
)
{
hist
.
Truncate
(
0
);
lr
.
WriteHistory
(
hist
)
})
js
.
withHistory
(
ethereum
.
DataDir
,
func
(
hist
*
os
.
File
)
{
hist
.
Truncate
(
0
);
lr
.
WriteHistory
(
hist
)
})
lr
.
Close
()
close
(
js
.
wait
)
}
...
...
@@ -433,12 +433,7 @@ func hidepassword(input string) string {
}
}
func
(
self
*
jsre
)
withHistory
(
op
func
(
*
os
.
File
))
{
datadir
:=
common
.
DefaultDataDir
()
if
self
.
ethereum
!=
nil
{
datadir
=
self
.
ethereum
.
DataDir
}
func
(
self
*
jsre
)
withHistory
(
datadir
string
,
op
func
(
*
os
.
File
))
{
hist
,
err
:=
os
.
OpenFile
(
filepath
.
Join
(
datadir
,
"history"
),
os
.
O_RDWR
|
os
.
O_CREATE
,
os
.
ModePerm
)
if
err
!=
nil
{
fmt
.
Printf
(
"unable to open history file: %v
\n
"
,
err
)
...
...
cmd/geth/main.go
浏览文件 @
27528ad3
...
...
@@ -429,6 +429,7 @@ func attach(ctx *cli.Context) {
repl
:=
newLightweightJSRE
(
ctx
.
GlobalString
(
utils
.
JSpathFlag
.
Name
),
client
,
ctx
.
GlobalString
(
utils
.
DataDirFlag
.
Name
),
true
,
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录