Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
libvirt
提交
9ced219a
L
libvirt
项目概览
openeuler
/
libvirt
通知
3
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
L
libvirt
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
9ced219a
编写于
9月 15, 2015
作者:
J
John Ferlan
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
virfile: Use virProcessWait in virDirCreate
Rather than inlining the code, use the common API.
上级
b01c68d9
变更
1
显示空白变更内容
内联
并排
Showing
1 changed file
with
19 addition
and
26 deletion
+19
-26
src/util/virfile.c
src/util/virfile.c
+19
-26
未找到文件。
src/util/virfile.c
浏览文件 @
9ced219a
...
...
@@ -2448,8 +2448,7 @@ virDirCreate(const char *path,
{
struct
stat
st
;
pid_t
pid
;
int
waitret
;
int
status
,
ret
=
0
;
int
status
=
0
,
ret
=
0
;
gid_t
*
groups
;
int
ngroups
;
...
...
@@ -2495,36 +2494,30 @@ virDirCreate(const char *path,
/* wait for child to complete, and retrieve its exit code */
VIR_FREE
(
groups
);
while
((
waitret
=
waitpid
(
pid
,
&
status
,
0
))
==
-
1
&&
errno
==
EINTR
);
if
(
waitret
==
-
1
)
{
ret
=
-
errno
;
virReportSystemError
(
errno
,
_
(
"failed to wait for child creating '%s'"
),
path
);
goto
parenterror
;
if
(
virProcessWait
(
pid
,
&
status
,
0
)
<
0
)
{
/* virProcessWait() reports errno on waitpid failure, so we'll just
* set our return status to EINTR; otherwise, set status to EACCES
* since the original failure for the fork+setuid path would have
* been EACCES or EPERM by definition.
*/
if
(
virLastErrorIsSystemErrno
(
0
))
status
=
EINTR
;
else
if
(
!
status
)
status
=
EACCES
;
}
/*
* If waitpid succeeded, but if the child exited abnormally or
* reported non-zero status, report failure, except for EACCES where
* we try to fall back to non-fork method as in the original logic
* introduced and explained by commit 98f6f381.
* If the child exited with EACCES, then fall back to non-fork method
* as in the original logic introduced and explained by commit 98f6f381.
*/
if
(
!
WIFEXITED
(
status
)
||
(
WEXITSTATUS
(
status
))
!=
0
)
{
if
(
WEXITSTATUS
(
status
)
==
EACCES
)
if
(
status
==
EACCES
)
{
virResetLastError
();
return
virDirCreateNoFork
(
path
,
mode
,
uid
,
gid
,
flags
);
char
*
msg
=
virProcessTranslateStatus
(
status
);
virReportError
(
VIR_ERR_INTERNAL_ERROR
,
_
(
"child failed to create '%s': %s"
),
path
,
msg
);
VIR_FREE
(
msg
);
if
(
WIFEXITED
(
status
))
ret
=
-
WEXITSTATUS
(
status
);
else
ret
=
-
EACCES
;
}
parenterror:
if
(
status
)
ret
=
-
status
;
return
ret
;
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录