From 6ca83412618920d67f29bd9c9a35bf9683f8da9c Mon Sep 17 00:00:00 2001 From: Jamie Cameron Date: Sun, 11 Jun 2017 13:28:14 -0700 Subject: [PATCH] Handle xz compressed files https://sourceforge.net/p/webadmin/bugs/4970/ --- syslog/save_log.cgi | 2 +- syslog/syslog-lib.pl | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/syslog/save_log.cgi b/syslog/save_log.cgi index 6e0a117ee..3ed8ba838 100755 --- a/syslog/save_log.cgi +++ b/syslog/save_log.cgi @@ -96,7 +96,7 @@ elsif ($in{'view'}) { } $cat = "(".join(" ; ", @cats).")"; $got = &proc::safe_process_exec( - "$cat | grep -i $filter | $tailcmd", + "$cat | grep -i -a $filter | $tailcmd", 0, 0, STDOUT, undef, 1, 0, undef, 1); } else { # Not filtering .. so cat the most recent non-empty file diff --git a/syslog/syslog-lib.pl b/syslog/syslog-lib.pl index 8c7f5cbce..10f46a4ed 100755 --- a/syslog/syslog-lib.pl +++ b/syslog/syslog-lib.pl @@ -354,6 +354,9 @@ elsif ($l =~ /\.Z$/i) { elsif ($l =~ /\.bz2$/i) { return &has_command("bunzip2") ? "bunzip2 -c $q" : undef; } +elsif ($l =~ /\.xz$/i) { + return &has_command("xz") ? "xz -d -c $q" : undef; + } else { return "cat $q"; }