Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
8c28632b
TDengine
项目概览
taosdata
/
TDengine
1 年多 前同步成功
通知
1185
Star
22016
Fork
4786
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
TDengine
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
未验证
提交
8c28632b
编写于
8月 27, 2021
作者:
sangshuduo
提交者:
GitHub
8月 27, 2021
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[TD-6292]<fix>: taosdump --config-dir determine input. (#7611)
上级
f1599338
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
16 addition
and
3 deletion
+16
-3
src/kit/taosdump/taosdump.c
src/kit/taosdump/taosdump.c
+16
-3
未找到文件。
src/kit/taosdump/taosdump.c
浏览文件 @
8c28632b
...
@@ -231,9 +231,9 @@ static struct argp_option options[] = {
...
@@ -231,9 +231,9 @@ static struct argp_option options[] = {
{
"inpath"
,
'i'
,
"INPATH"
,
0
,
"Input file path."
,
1
},
{
"inpath"
,
'i'
,
"INPATH"
,
0
,
"Input file path."
,
1
},
{
"resultFile"
,
'r'
,
"RESULTFILE"
,
0
,
"DumpOut/In Result file path and name."
,
1
},
{
"resultFile"
,
'r'
,
"RESULTFILE"
,
0
,
"DumpOut/In Result file path and name."
,
1
},
#ifdef _TD_POWER_
#ifdef _TD_POWER_
{
"config"
,
'c'
,
"CONFIG_DIR"
,
0
,
"Configure directory. Default is /etc/power/taos.cfg."
,
1
},
{
"config
-dir
"
,
'c'
,
"CONFIG_DIR"
,
0
,
"Configure directory. Default is /etc/power/taos.cfg."
,
1
},
#else
#else
{
"config"
,
'c'
,
"CONFIG_DIR"
,
0
,
"Configure directory. Default is /etc/taos/taos.cfg."
,
1
},
{
"config
-dir
"
,
'c'
,
"CONFIG_DIR"
,
0
,
"Configure directory. Default is /etc/taos/taos.cfg."
,
1
},
#endif
#endif
{
"encode"
,
'e'
,
"ENCODE"
,
0
,
"Input file encoding."
,
1
},
{
"encode"
,
'e'
,
"ENCODE"
,
0
,
"Input file encoding."
,
1
},
// dump unit options
// dump unit options
...
@@ -367,6 +367,15 @@ struct arguments g_args = {
...
@@ -367,6 +367,15 @@ struct arguments g_args = {
false
// performance_print
false
// performance_print
};
};
static
void
errorPrintReqArg3
(
char
*
program
,
char
*
wrong_arg
)
{
fprintf
(
stderr
,
"%s: option '%s' requires an argument
\n
"
,
program
,
wrong_arg
);
fprintf
(
stderr
,
"Try `taosdump --help' or `taosdump --usage' for more information.
\n
"
);
}
/* Parse a single option. */
/* Parse a single option. */
static
error_t
parse_opt
(
int
key
,
char
*
arg
,
struct
argp_state
*
state
)
{
static
error_t
parse_opt
(
int
key
,
char
*
arg
,
struct
argp_state
*
state
)
{
/* Get the input argument from argp_parse, which we
/* Get the input argument from argp_parse, which we
...
@@ -418,9 +427,13 @@ static error_t parse_opt(int key, char *arg, struct argp_state *state) {
...
@@ -418,9 +427,13 @@ static error_t parse_opt(int key, char *arg, struct argp_state *state) {
g_args
.
resultFile
=
arg
;
g_args
.
resultFile
=
arg
;
break
;
break
;
case
'c'
:
case
'c'
:
if
(
0
==
strlen
(
arg
))
{
errorPrintReqArg3
(
"taosdump"
,
"-c or --config-dir"
);
exit
(
EXIT_FAILURE
);
}
if
(
wordexp
(
arg
,
&
full_path
,
0
)
!=
0
)
{
if
(
wordexp
(
arg
,
&
full_path
,
0
)
!=
0
)
{
errorPrint
(
"Invalid path %s
\n
"
,
arg
);
errorPrint
(
"Invalid path %s
\n
"
,
arg
);
return
-
1
;
exit
(
EXIT_FAILURE
)
;
}
}
tstrncpy
(
configDir
,
full_path
.
we_wordv
[
0
],
MAX_FILE_NAME_LEN
);
tstrncpy
(
configDir
,
full_path
.
we_wordv
[
0
],
MAX_FILE_NAME_LEN
);
wordfree
(
&
full_path
);
wordfree
(
&
full_path
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录