Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-03-01 13:57:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1136193 - OSObject issues, r=sfink

Browse Source
This commit is contained in:
Jon Coppeard 2015-02-25 08:41:00 -08:00
parent 553cdbd8f5
commit f2e458ed92
2 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
js/src/shell/OSObject.cpp
View File

@ -164,16 +164,16 @@ os_spawn(JSContext *cx, unsigned argc, jsval *vp)
return false;
int32_t childPid = fork();
if (childPid) {
args.rval().setInt32(childPid);
return true;
}
if (childPid == -1) {
ReportSysError(cx, "fork failed");
return false;
}
if (childPid) {
args.rval().setInt32(childPid);
return true;
}
// We are in the child
const char *cmd[] = {"sh", "-c", nullptr, nullptr};
@ -208,8 +208,11 @@ os_kill(JSContext* cx, unsigned argc, Value* vp)
}
int status = kill(pid, signal);
if (status == -1)
if (status == -1) {
ReportSysError(cx, "kill failed");
return false;
}
args.rval().setUndefined();
return true;
}
@ -231,7 +234,7 @@ os_waitpid(JSContext* cx, unsigned argc, Value* vp)
if (args.length() >= 2)
nohang = JS::ToBoolean(args[1]);
int status;
int status = 0;
pid_t result = waitpid(pid, &status, nohang ? WNOHANG : 0);
if (result == -1) {
ReportSysError(cx, "os.waitpid failed");
@ -247,11 +250,11 @@ os_waitpid(JSContext* cx, unsigned argc, Value* vp)
v.setInt32(result);
if (!JS_DefineProperty(cx, info, "pid", v, JSPROP_ENUMERATE))
return false;
}
if (WIFEXITED(status)) {
v.setInt32(WEXITSTATUS(status));
if (!JS_DefineProperty(cx, info, "exitStatus", v, JSPROP_ENUMERATE))
return false;
if (WIFEXITED(status)) {
v.setInt32(WEXITSTATUS(status));
if (!JS_DefineProperty(cx, info, "exitStatus", v, JSPROP_ENUMERATE))
return false;
}
}
args.rval().setObject(*info);

2
js/src/tests/shell/os.js
View File

@ -15,7 +15,7 @@ assertEq(os.getenv("SQUAMMISH_HILLBILLY_GOAT_SQUEEZERS"), undefined);
assertEq(os.system("true"), 0, "/bin/true should exit 0");
assertEq(os.system("false") != 0, true, "/bin/false should exit nonzero");
var kidpid = os.spawn("sleep 3600");
var kidpid = os.spawn("sleep 60");
assertEq(kidpid > 0, true, "spawning sleep");
var info = os.waitpid(kidpid, true);
assertEq(info.hasOwnProperty("pid"), false);