Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
iSulad
提交
4eeb13ae
I
iSulad
项目概览
openeuler
/
iSulad
通知
15
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
I
iSulad
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
4eeb13ae
编写于
8月 28, 2020
作者:
O
openeuler-ci-bot
提交者:
Gitee
8月 28, 2020
浏览文件
操作
浏览文件
下载
差异文件
!688 unpack: restore file uid/gid when unpack
Merge pull request !688 from lifeng_isula/master
上级
522a328c
bf941010
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
12 addition
and
11 deletion
+12
-11
src/utils/tar/util_archive.c
src/utils/tar/util_archive.c
+12
-11
未找到文件。
src/utils/tar/util_archive.c
浏览文件 @
4eeb13ae
...
...
@@ -163,12 +163,14 @@ int archive_unpack_handler(const struct io_read_wrapper *content, const char *ds
mydata
->
content
=
content
;
flags
=
ARCHIVE_EXTRACT_TIME
;
flags
|=
ARCHIVE_EXTRACT_OWNER
;
flags
|=
ARCHIVE_EXTRACT_PERM
;
flags
|=
ARCHIVE_EXTRACT_ACL
;
flags
|=
ARCHIVE_EXTRACT_FFLAGS
;
flags
|=
ARCHIVE_EXTRACT_SECURE_SYMLINKS
;
flags
|=
ARCHIVE_EXTRACT_SECURE_NODOTDOT
;
flags
|=
ARCHIVE_EXTRACT_XATTR
;
flags
|=
ARCHIVE_EXTRACT_SECURE_NOABSOLUTEPATHS
;
a
=
archive_read_new
();
archive_read_support_filter_all
(
a
);
...
...
@@ -318,15 +320,15 @@ bool valid_archive_format(const char *file)
ret
=
archive_read_support_filter_all
(
read_archive
);
if
(
ret
!=
ARCHIVE_OK
)
{
ERROR
(
"Failed to set archive read support filter all, result is %d, errmsg: %s"
,
ret
,
archive_error_string
(
read_archive
));
ERROR
(
"Failed to set archive read support filter all, result is %d, errmsg: %s"
,
ret
,
archive_error_string
(
read_archive
));
goto
out
;
}
ret
=
archive_read_support_format_all
(
read_archive
);
if
(
ret
!=
ARCHIVE_OK
)
{
ERROR
(
"Failed to set archive read support format all, result is %d, errmsg: %s"
,
ret
,
archive_error_string
(
read_archive
));
ERROR
(
"Failed to set archive read support format all, result is %d, errmsg: %s"
,
ret
,
archive_error_string
(
read_archive
));
goto
out
;
}
...
...
@@ -399,10 +401,10 @@ int update_entry_for_hardlink(map_t *map_link, struct archive_entry *entry)
return
0
;
}
linkname
=
map_search
(
map_link
,
(
void
*
)
&
ino
);
linkname
=
map_search
(
map_link
,
(
void
*
)
&
ino
);
if
(
linkname
==
NULL
)
{
linkname
=
(
char
*
)
path
;
if
(
!
map_insert
(
map_link
,
(
void
*
)
&
ino
,
linkname
))
{
linkname
=
(
char
*
)
path
;
if
(
!
map_insert
(
map_link
,
(
void
*
)
&
ino
,
linkname
))
{
ERROR
(
"insert to map failed"
);
fprintf
(
stderr
,
"insert to map failed"
);
return
-
1
;
...
...
@@ -457,9 +459,8 @@ int tar_handler(struct archive *r, struct archive *w)
ret
=
archive_write_header
(
w
,
entry
);
if
(
ret
!=
ARCHIVE_OK
)
{
ERROR
(
"Fail to write tar header: %s"
,
archive_error_string
(
w
));
fprintf
(
stderr
,
"Fail to write tar header: %s
\n
link:%s target:%s"
,
archive_error_string
(
w
),
archive_entry_pathname
(
entry
),
archive_entry_hardlink
(
entry
));
fprintf
(
stderr
,
"Fail to write tar header: %s
\n
link:%s target:%s"
,
archive_error_string
(
w
),
archive_entry_pathname
(
entry
),
archive_entry_hardlink
(
entry
));
break
;
}
...
...
@@ -536,7 +537,7 @@ int archive_chroot_tar(char *path, char *file, char **errmsg)
pid_t
pid
;
int
pipe_for_read
[
2
]
=
{
-
1
,
-
1
};
int
keepfds
[]
=
{
-
1
,
-
1
};
char
errbuf
[
BUFSIZ
]
=
{
0
};
char
errbuf
[
BUFSIZ
]
=
{
0
};
int
fd
=
0
;
if
(
pipe2
(
pipe_for_read
,
O_CLOEXEC
)
!=
0
)
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录