Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
FIY695
jenkins
提交
55067807
J
jenkins
项目概览
FIY695
/
jenkins
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
J
jenkins
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
55067807
编写于
11月 07, 2011
作者:
K
Kohsuke Kawaguchi
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[FIXED JENKINS-9634] fixed a bug in the Mac OS X arg parsing code
上级
737a7dfe
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
12 addition
and
7 deletion
+12
-7
changelog.html
changelog.html
+3
-0
core/src/main/java/hudson/util/ProcessTree.java
core/src/main/java/hudson/util/ProcessTree.java
+9
-7
未找到文件。
changelog.html
浏览文件 @
55067807
...
...
@@ -64,6 +64,9 @@ Upcoming changes</a>
<li
class=
bug
>
Debian init script now returns the proper exit code from the 'status' command.
(
<a
href=
"https://issues.jenkins-ci.org/browse/JENKINS-11306"
>
issue 11306
</a>
)
<li
class=
bug
>
Fixed a bug in Mac OS X ProcessKiller argument parsing.
(
<a
href=
"https://issues.jenkins-ci.org/browse/JENKINS-9634"
>
issue 9634
</a>
)
<li
class=
rfe
>
Sortable table wasn't "stable" when there are same values in different rows
(
<a
href=
"https://issues.jenkins-ci.org/browse/JENKINS-11551"
>
issue 11551
</a>
)
...
...
core/src/main/java/hudson/util/ProcessTree.java
浏览文件 @
55067807
...
...
@@ -1001,7 +1001,7 @@ public abstract class ProcessTree implements Iterable<OSProcess>, IProcessTree,
}
void
skip0
()
{
// skip
trail
ing '\0's
// skip
padd
ing '\0's
while
(
getByte
(
offset
)==
'\0'
)
offset
++;
}
...
...
@@ -1052,20 +1052,22 @@ public abstract class ProcessTree implements Iterable<OSProcess>, IProcessTree,
* \---------------/ 0xffffffff
*/
int
nargs
=
m
.
readInt
();
// I find the Darwin source code of the 'ps' command helpful in understanding how it does this:
// see http://www.opensource.apple.com/source/adv_cmds/adv_cmds-147/ps/print.c
int
argc
=
m
.
readInt
();
String
args0
=
m
.
readString
();
// exec path
m
.
skip0
();
try
{
for
(
int
i
=
0
;
i
<
nargs
;
i
++)
{
m
.
skip0
();
for
(
int
i
=
0
;
i
<
argc
;
i
++)
{
arguments
.
add
(
m
.
readString
());
}
}
catch
(
IndexOutOfBoundsException
e
)
{
throw
new
IllegalStateException
(
"Failed to parse arguments: arg0="
+
args0
+
", arguments="
+
arguments
+
", nargs="
+
nargs
,
e
);
throw
new
IllegalStateException
(
"Failed to parse arguments: arg0="
+
args0
+
", arguments="
+
arguments
+
", nargs="
+
argc
,
e
);
}
//
this is how you can read environment variables
//
read env vars that follow
while
(
m
.
peek
()!=
0
)
envVars
.
addLine
(
m
.
readString
());
envVars
.
addLine
(
m
.
readString
());
}
catch
(
IOException
e
)
{
// this happens with insufficient permissions, so just ignore the problem.
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录