michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-03-20 16:50:24 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Use more reliable backquote function to capture output

Browse Source
This commit is contained in:
Jamie Cameron
2012-10-09 16:33:31 -07:00
parent dda0c0e7a9
commit 57a1a5d0cf
1 changed files with 2 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
init/init-lib.pl
View File

@@ -1114,13 +1114,8 @@ if ($action_mode eq "init" || $action_mode eq "local") {
if (!-x $fn) {
return (0, "$fn does not exist");
}
local $temp = &transname();
&foreign_require("proc", "proc-lib.pl");
open(TEMP, ">$temp");
&proc::safe_process_exec_logged("$fn start", 0, 0, TEMP);
close(TEMP);
local $out = &backquote_logged("$fn start 2>&1 </dev/null");
local $ex = $?;
local $out = &read_file_contents($temp);
return (!$ex, $out);
}
elsif ($action_mode eq "rc") {
@@ -1163,13 +1158,8 @@ if ($action_mode eq "init" || $action_mode eq "local") {
if (!-x $fn) {
return (0, "$fn does not exist");
}
local $temp = &transname();
&foreign_require("proc", "proc-lib.pl");
open(TEMP, ">$temp");
&proc::safe_process_exec_logged("$fn stop", 0, 0, TEMP);
close(TEMP);
local $out = &backquote_logged("$fn stop 2>&1 </dev/null");
local $ex = $?;
local $out = &read_file_contents($temp);
return (!$ex, $out);
}
elsif ($action_mode eq "rc") {