michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-02-03 14:13:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Handle missing file case https://github.com/webmin/webmin/issues/912

Browse Source
This commit is contained in:
Jamie Cameron
2018-05-01 11:19:54 -07:00
parent 72ea3e27be
commit 8f1bba0773
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
syslog/save_log.cgi
View File

@@ -108,9 +108,15 @@ elsif ($in{'view'}) {
}
$eflag = $gconfig{'os_type'} =~ /-linux/ ? "-E" : "";
$dashflag = $gconfig{'os_type'} =~ /-linux/ ? "--" : "";
$got = &proc::safe_process_exec(
"$cat | grep -i -a $eflag $dashflag $filter | $tailcmd",
0, 0, STDOUT, undef, 1, 0, undef, 1);
if (@cats) {
$got = &proc::safe_process_exec(
"$cat | grep -i -a $eflag $dashflag $filter ".
"| $tailcmd",
0, 0, STDOUT, undef, 1, 0, undef, 1);
}
else {
$got = undef;
}
} else {
# Not filtering .. so cat the most recent non-empty file
if ($cmd) {