Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
dgr6878
TDengine
提交
c1bc7ef9
T
TDengine
项目概览
dgr6878
/
TDengine
与 Fork 源项目一致
Fork自
taosdata / TDengine
通知
8
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
T
TDengine
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
c1bc7ef9
编写于
5月 26, 2020
作者:
B
Bomin Zhang
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
shell suport multiple commands in single statement
上级
7c31b143
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
111 addition
and
106 deletion
+111
-106
src/kit/shell/src/shellDarwin.c
src/kit/shell/src/shellDarwin.c
+3
-6
src/kit/shell/src/shellEngine.c
src/kit/shell/src/shellEngine.c
+104
-87
src/kit/shell/src/shellLinux.c
src/kit/shell/src/shellLinux.c
+2
-8
src/kit/shell/src/shellWindows.c
src/kit/shell/src/shellWindows.c
+2
-5
未找到文件。
src/kit/shell/src/shellDarwin.c
浏览文件 @
c1bc7ef9
...
@@ -335,17 +335,14 @@ void *shellLoopQuery(void *arg) {
...
@@ -335,17 +335,14 @@ void *shellLoopQuery(void *arg) {
tscError
(
"failed to malloc command"
);
tscError
(
"failed to malloc command"
);
return
NULL
;
return
NULL
;
}
}
while
(
1
)
{
// Read command from shell.
do
{
// Read command from shell.
memset
(
command
,
0
,
MAX_COMMAND_SIZE
);
memset
(
command
,
0
,
MAX_COMMAND_SIZE
);
set_terminal_mode
();
set_terminal_mode
();
shellReadCommand
(
con
,
command
);
shellReadCommand
(
con
,
command
);
reset_terminal_mode
();
reset_terminal_mode
();
}
while
(
shellRunCommand
(
con
,
command
)
==
0
);
// Run the command
shellRunCommand
(
con
,
command
);
}
pthread_cleanup_pop
(
1
);
pthread_cleanup_pop
(
1
);
...
...
src/kit/shell/src/shellEngine.c
浏览文件 @
c1bc7ef9
...
@@ -82,20 +82,15 @@ TAOS *shellInit(SShellArguments *args) {
...
@@ -82,20 +82,15 @@ TAOS *shellInit(SShellArguments *args) {
// Check if it is temperory run
// Check if it is temperory run
if
(
args
->
commands
!=
NULL
||
args
->
file
[
0
]
!=
0
)
{
if
(
args
->
commands
!=
NULL
||
args
->
file
[
0
]
!=
0
)
{
if
(
args
->
commands
!=
NULL
)
{
if
(
args
->
commands
!=
NULL
)
{
char
*
token
;
printf
(
"%s%s
\n
"
,
PROMPT_HEADER
,
args
->
commands
);
token
=
strtok
(
args
->
commands
,
";"
);
shellRunCommand
(
con
,
args
->
commands
);
while
(
token
!=
NULL
)
{
printf
(
"%s%s
\n
"
,
PROMPT_HEADER
,
token
);
shellRunCommand
(
con
,
token
);
token
=
strtok
(
NULL
,
";"
);
}
}
}
if
(
args
->
file
[
0
]
!=
0
)
{
if
(
args
->
file
[
0
]
!=
0
)
{
source_file
(
con
,
args
->
file
);
source_file
(
con
,
args
->
file
);
}
}
taos_close
(
con
);
taos_close
(
con
);
write_history
();
write_history
();
exit
(
EXIT_SUCCESS
);
exit
(
EXIT_SUCCESS
);
}
}
...
@@ -111,96 +106,37 @@ TAOS *shellInit(SShellArguments *args) {
...
@@ -111,96 +106,37 @@ TAOS *shellInit(SShellArguments *args) {
return
con
;
return
con
;
}
}
void
shellReplaceCtrlChar
(
char
*
str
)
{
_Bool
ctrlOn
=
false
;
char
*
pstr
=
NULL
;
char
quote
=
0
;
for
(
pstr
=
str
;
*
str
!=
'\0'
;
++
str
)
{
static
bool
isEmptyCommand
(
const
char
*
cmd
)
{
if
(
ctrlOn
)
{
for
(
char
c
=
*
cmd
++
;
c
!=
0
;
c
=
*
cmd
++
)
{
switch
(
*
str
)
{
if
(
c
!=
' '
&&
c
!=
'\t'
&&
c
!=
';'
)
{
case
'n'
:
return
false
;
*
pstr
=
'\n'
;
pstr
++
;
break
;
case
'r'
:
*
pstr
=
'\r'
;
pstr
++
;
break
;
case
't'
:
*
pstr
=
'\t'
;
pstr
++
;
break
;
case
'G'
:
*
pstr
++
=
'\\'
;
*
pstr
++
=
*
str
;
break
;
case
'\\'
:
*
pstr
=
'\\'
;
pstr
++
;
break
;
case
'\''
:
case
'"'
:
if
(
quote
)
{
*
pstr
++
=
'\\'
;
*
pstr
++
=
*
str
;
}
break
;
default:
*
pstr
=
*
str
;
pstr
++
;
break
;
}
ctrlOn
=
false
;
}
else
{
if
(
*
str
==
'\\'
)
{
ctrlOn
=
true
;
}
else
{
if
(
quote
==
*
str
)
{
quote
=
0
;
}
else
if
(
*
str
==
'\''
||
*
str
==
'"'
)
{
quote
=
*
str
;
}
*
pstr
=
*
str
;
pstr
++
;
}
}
}
}
}
*
pstr
=
'\0'
;
return
true
;
}
}
int32_t
shellRunCommand
(
TAOS
*
con
,
char
*
command
)
{
static
int32_t
shellRunSingleCommand
(
TAOS
*
con
,
char
*
command
)
{
/* If command is empty just return */
/* If command is empty just return */
if
(
regex_match
(
command
,
"^[
\t
;]*$"
,
REG_EXTENDED
))
{
if
(
isEmptyCommand
(
command
))
{
return
0
;
return
0
;
}
}
/* Update the history vector. */
if
(
history
.
hstart
==
history
.
hend
||
history
.
hist
[(
history
.
hend
+
MAX_HISTORY_SIZE
-
1
)
%
MAX_HISTORY_SIZE
]
==
NULL
||
strcmp
(
command
,
history
.
hist
[(
history
.
hend
+
MAX_HISTORY_SIZE
-
1
)
%
MAX_HISTORY_SIZE
])
!=
0
)
{
if
(
history
.
hist
[
history
.
hend
]
!=
NULL
)
{
tfree
(
history
.
hist
[
history
.
hend
]);
}
history
.
hist
[
history
.
hend
]
=
strdup
(
command
);
history
.
hend
=
(
history
.
hend
+
1
)
%
MAX_HISTORY_SIZE
;
if
(
history
.
hend
==
history
.
hstart
)
{
history
.
hstart
=
(
history
.
hstart
+
1
)
%
MAX_HISTORY_SIZE
;
}
}
shellReplaceCtrlChar
(
command
);
// Analyse the command.
// Analyse the command.
if
(
regex_match
(
command
,
"^[
\t
]*(quit|q|exit)[
\t
;]*$"
,
REG_EXTENDED
|
REG_ICASE
))
{
if
(
regex_match
(
command
,
"^[
\t
]*(quit|q|exit)[
\t
;]*$"
,
REG_EXTENDED
|
REG_ICASE
))
{
taos_close
(
con
);
taos_close
(
con
);
write_history
();
write_history
();
return
-
1
;
return
-
1
;
}
else
if
(
regex_match
(
command
,
"^[
\t
]*clear[
\t
;]*$"
,
REG_EXTENDED
|
REG_ICASE
))
{
}
if
(
regex_match
(
command
,
"^[
\t
]*clear[
\t
;]*$"
,
REG_EXTENDED
|
REG_ICASE
))
{
// If clear the screen.
// If clear the screen.
system
(
"clear"
);
system
(
"clear"
);
}
else
if
(
regex_match
(
command
,
"^[
\t
]*set[
\t
]+max_binary_display_width[
\t
]+(default|[1-9][0-9]*)[
\t
;]*$"
,
REG_EXTENDED
|
REG_ICASE
))
{
return
0
;
}
if
(
regex_match
(
command
,
"^[
\t
]*set[
\t
]+max_binary_display_width[
\t
]+(default|[1-9][0-9]*)[
\t
;]*$"
,
REG_EXTENDED
|
REG_ICASE
))
{
strtok
(
command
,
"
\t
"
);
strtok
(
command
,
"
\t
"
);
strtok
(
NULL
,
"
\t
"
);
strtok
(
NULL
,
"
\t
"
);
char
*
p
=
strtok
(
NULL
,
"
\t
"
);
char
*
p
=
strtok
(
NULL
,
"
\t
"
);
...
@@ -209,21 +145,102 @@ int32_t shellRunCommand(TAOS *con, char *command) {
...
@@ -209,21 +145,102 @@ int32_t shellRunCommand(TAOS *con, char *command) {
}
else
{
}
else
{
tsMaxBinaryDisplayWidth
=
atoi
(
p
);
tsMaxBinaryDisplayWidth
=
atoi
(
p
);
}
}
}
else
if
(
regex_match
(
command
,
"^[
\t
]*source[
\t
]+[^ ]+[
\t
;]*$"
,
REG_EXTENDED
|
REG_ICASE
))
{
return
0
;
}
if
(
regex_match
(
command
,
"^[
\t
]*source[
\t
]+[^ ]+[
\t
;]*$"
,
REG_EXTENDED
|
REG_ICASE
))
{
/* If source file. */
/* If source file. */
char
*
c_ptr
=
strtok
(
command
,
" ;"
);
char
*
c_ptr
=
strtok
(
command
,
" ;"
);
assert
(
c_ptr
!=
NULL
);
assert
(
c_ptr
!=
NULL
);
c_ptr
=
strtok
(
NULL
,
" ;"
);
c_ptr
=
strtok
(
NULL
,
" ;"
);
assert
(
c_ptr
!=
NULL
);
assert
(
c_ptr
!=
NULL
);
source_file
(
con
,
c_ptr
);
source_file
(
con
,
c_ptr
);
}
else
{
return
0
;
shellRunCommandOnServer
(
con
,
command
);
}
}
shellRunCommandOnServer
(
con
,
command
);
return
0
;
return
0
;
}
}
int32_t
shellRunCommand
(
TAOS
*
con
,
char
*
command
)
{
/* If command is empty just return */
if
(
isEmptyCommand
(
command
))
{
return
0
;
}
/* Update the history vector. */
if
(
history
.
hstart
==
history
.
hend
||
history
.
hist
[(
history
.
hend
+
MAX_HISTORY_SIZE
-
1
)
%
MAX_HISTORY_SIZE
]
==
NULL
||
strcmp
(
command
,
history
.
hist
[(
history
.
hend
+
MAX_HISTORY_SIZE
-
1
)
%
MAX_HISTORY_SIZE
])
!=
0
)
{
if
(
history
.
hist
[
history
.
hend
]
!=
NULL
)
{
tfree
(
history
.
hist
[
history
.
hend
]);
}
history
.
hist
[
history
.
hend
]
=
strdup
(
command
);
history
.
hend
=
(
history
.
hend
+
1
)
%
MAX_HISTORY_SIZE
;
if
(
history
.
hend
==
history
.
hstart
)
{
history
.
hstart
=
(
history
.
hstart
+
1
)
%
MAX_HISTORY_SIZE
;
}
}
bool
esc
=
false
;
char
quote
=
0
,
*
cmd
=
command
,
*
p
=
command
;
for
(
char
c
=
*
command
++
;
c
!=
0
;
c
=
*
command
++
)
{
if
(
esc
)
{
switch
(
c
)
{
case
'n'
:
c
=
'\n'
;
break
;
case
'r'
:
c
=
'\r'
;
break
;
case
't'
:
c
=
'\t'
;
break
;
case
'G'
:
*
p
++
=
'\\'
;
break
;
case
'\''
:
case
'"'
:
if
(
quote
)
{
*
p
++
=
'\\'
;
}
break
;
}
*
p
++
=
c
;
esc
=
false
;
continue
;
}
if
(
c
==
'\\'
)
{
esc
=
true
;
continue
;
}
if
(
quote
==
c
)
{
quote
=
0
;
}
else
if
(
c
==
'\''
||
c
==
'"'
)
{
quote
=
c
;
}
*
p
++
=
c
;
if
(
c
==
';'
)
{
c
=
*
p
;
*
p
=
0
;
if
(
shellRunSingleCommand
(
con
,
cmd
)
<
0
)
{
return
-
1
;
}
*
p
=
c
;
p
=
cmd
;
}
}
*
p
=
0
;
return
shellRunSingleCommand
(
con
,
cmd
);
}
void
shellRunCommandOnServer
(
TAOS
*
con
,
char
command
[])
{
void
shellRunCommandOnServer
(
TAOS
*
con
,
char
command
[])
{
int64_t
st
,
et
;
int64_t
st
,
et
;
wordexp_t
full_path
;
wordexp_t
full_path
;
...
...
src/kit/shell/src/shellLinux.c
浏览文件 @
c1bc7ef9
...
@@ -307,19 +307,13 @@ void *shellLoopQuery(void *arg) {
...
@@ -307,19 +307,13 @@ void *shellLoopQuery(void *arg) {
return
NULL
;
return
NULL
;
}
}
while
(
1
)
{
do
{
// Read command from shell.
// Read command from shell.
memset
(
command
,
0
,
MAX_COMMAND_SIZE
);
memset
(
command
,
0
,
MAX_COMMAND_SIZE
);
set_terminal_mode
();
set_terminal_mode
();
shellReadCommand
(
con
,
command
);
shellReadCommand
(
con
,
command
);
reset_terminal_mode
();
reset_terminal_mode
();
}
while
(
shellRunCommand
(
con
,
command
)
==
0
);
// Run the command
if
(
shellRunCommand
(
con
,
command
)
!=
0
)
{
break
;
}
}
tfree
(
command
);
tfree
(
command
);
exitShell
();
exitShell
();
...
...
src/kit/shell/src/shellWindows.c
浏览文件 @
c1bc7ef9
...
@@ -203,16 +203,13 @@ void *shellLoopQuery(void *arg) {
...
@@ -203,16 +203,13 @@ void *shellLoopQuery(void *arg) {
char
*
command
=
malloc
(
MAX_COMMAND_SIZE
);
char
*
command
=
malloc
(
MAX_COMMAND_SIZE
);
if
(
command
==
NULL
)
return
NULL
;
if
(
command
==
NULL
)
return
NULL
;
while
(
1
)
{
do
{
memset
(
command
,
0
,
MAX_COMMAND_SIZE
);
memset
(
command
,
0
,
MAX_COMMAND_SIZE
);
shellPrintPrompt
();
shellPrintPrompt
();
// Read command from shell.
// Read command from shell.
shellReadCommand
(
con
,
command
);
shellReadCommand
(
con
,
command
);
}
while
(
shellRunCommand
(
con
,
command
)
==
0
);
// Run the command
shellRunCommand
(
con
,
command
);
}
return
NULL
;
return
NULL
;
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录