imacat/reslog
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: imacat:main
Branches Tags
imacat:main
..
compare: imacat:fb37d091d6e08768396bd9ed8a421cb51f3bff39
Branches Tags
imacat:main

No commits in common. "main" and "fb37d091d6e08768396bd9ed8a421cb51f3bff39" have entirely different histories.
main ... fb37d091d6

9 changed files with 230 additions and 817 deletions
Show Stats Expand all files Collapse all files

5
Build.PL
View File

@ -61,9 +61,8 @@ my $build = Module::Build->new(
},
recommends => {
"File::MMagic" => 0,
"IO::Compress::Gzip" => 0,
"IO::Compress::Bzip2" => 0,
"IO::Compress::Xz" => 0,
"Compress::Zlib" => 0,
"Compress::Bzip2" => 2,
"Term::ReadKey" => 0,
},
build_requires => {

7
Changes
View File

@ -1,12 +1,5 @@
reslog change log
2022-03-19 version 3.18
1. Added support for the xz compression.
2. Replaced Compress::Zlib with IO::Compress::Gzip and
IO::Uncompress::Gunzip.
3. Replaced Compress::Bzip2 with IO::Compress::Bzip2 and
IO::Uncompress::Bunzip2.
2020-02-06 version 3.17
1. Replaced the messy GNU-styled, multi-lingual documents with a
single Markdown README.md.

5
Makefile.PL
View File

@ -52,9 +52,8 @@ EOT
our (%OPT_PREREQ);
%OPT_PREREQ = (
"File::MMagic" => 0,
"IO::Compress::Gzip" => 0,
"IO::Compress::Bzip2" => 0,
"IO::Compress::Xz" => 0,
"Compress::Zlib" => 0,
"Compress::Bzip2" => 2,
"Term::ReadKey" => 0,
);
delete $OPT_PREREQ{$_}

113
README.md
View File

@ -40,10 +40,10 @@ Caution
* I suggest that you install [File::MMagic] instead of counting on the
`file` executable. The internal magic file of File::MMagic works
better than the `file` executable. `reslog` treats everything not
gzip, bzip2, nor xz compressed as plain text. When a compressed log
file is wrongly recognized as an image, `reslog` treats it as plain
text, reads directly from it, and fails. This does not hurt the
source log files, but is still annoying.
gzip nor bzip2 compressed as plain text. When a compressed log file
is wrongly recognized as an image, `reslog` treats it as plain text,
reads directly from it, and fails. This does not hurt the source
log files, but is still annoying.
[File::MMagic]: https://metacpan.org/release/File-MMagic
@ -97,23 +97,22 @@ System Requirement
the [GnuWin32] home page. Be sure to save it as `file.exe`
somewhere in your `PATH`.
* [IO::Compress::Gzip] and [IO::Uncompress::Gunzip]
* [Compress::Zlib]
They are used to support reading/writing the gzip compressed
This is used to support reading/writing the gzip compressed
files. It is only needed when gzip compressed files are
encountered. If they are not available, `arclog` tries the
`gzip` executable instead. If that is not available, too,
`arclog` fails. You should not worry about IO::Compress::Gzip
since it comes with Perl since version 5.9.3. If not, it is
contained in the [IO-Compress] distribution. You can download
and install it from the CPAN archive, or install it with the
CPAN shell:
encountered. If it is not available, `arclog` tries the `gzip`
executable instead. If that is not available, too, `arclog`
fails. You should not worry about Compress::Zlib since it comes
with Perl since version 5.9.3. If not, it is contained in the
[IO-Compress] distribution. You can download and install it from
the CPAN archive, or install it with the CPAN shell:
cpan IO::Compress::Gzip
cpan Compress::Zlib
or with the CPANPLUS shell:
cpanp i IO::Compress::Gzip
cpanp i Compress::Zlib
For Debian/Ubuntu:
@ -135,80 +134,43 @@ System Requirement
[the gzip website]. Be sure to save it as `gzip.exe` somewhere
in your `PATH`.
* [IO::Compress::Bzip2] and [IO::Uncompress::Bunzip2]
* [Compress::Bzip2] version 2 or above.
They are used to support reading/writing the bzip2 compressed
files. They are only needed when bzip2 compressed files are
encountered. If they are not available, `arclog` tries the
`bzip2` executable instead. If that is not available, too,
`arclog` fails. You should not worry about IO::Compress::Bzip2
since it comes with Perl since version 5.10.1. If not, it is
contained in the [IO-Compress] distribution. You can download
and install it from the CPAN archive, or install it with the
CPAN shell:
This is used to support reading/writing the bzip2 compressed
files. It is only needed when bzip2 compressed files are
encountered. If it is not available, `reslog` tries the `bzip2`
executable instead. If that is not available, too, `reslog`
fails. Notice that older versions before 2 does not work, since
the file I/O compression was not implemented yet. You can
download and install Compress::Bzip2 from the CPAN archive, or
install it with the CPAN shell:
cpan IO::Compress::Bzip2
cpan Compress::Bzip2
or with the CPANPLUS shell:
cpanp i IO::Compress::Bzip2
cpanp i Compress::Bzip2
For Debian/Ubuntu:
sudo apt install libio-compress-perl
sudo apt install libcompress-bzip2-perl
For Red Hat/Fedora/CentOS:
sudo yum install perl-IO-Compress
sudo yum install perl-Compress-Bzip2
For FreeBSD:
ports install p5-IO-Compress
ports install p5-Compress-Bzip2
For ActivePerl:
ppm install IO-Compress
ppm install Compress-Bzip2
The alternative `bzip2.exe` for MS-Windows can be obtained from
[the bzip2 website]. Be sure to save it as `bzip2.exe` somewhere
in your `PATH`.
* [IO::Compress::Xz] and [IO::Uncompress::UnXz]
They are used to support reading/writing the xz compressed
files. It is only needed when xz compressed files are
encountered. If it is not available, `arclog` tries the `xz`
executable instead. If that is not available, too, `arclog`
fails. They are contained in the [IO-Compress-Lzma] distribution.
You can download and install it from the CPAN archive, or install
them with the CPAN shell:
cpan IO::Compress::Xz
or with the CPANPLUS shell:
cpanp i IO::Compress::Xz
For Debian/Ubuntu:
sudo apt install libio-compress-lzma-perl
For Red Hat/Fedora/CentOS:
sudo yum install perl-IO-Compress-Lzma
For FreeBSD:
ports install p5-IO-Compress-Lzma
For ActivePerl:
ppm install IO-Compress-Lzma
The alternative `xz.exe` for MS-Windows can be obtained from
[the XZ Utils website]. Be sure to save it as `xz.exe`
somewhere in your `PATH`.
* [Term::ReadKey]
This is used to display the progress bar. The progress bar is a
@ -244,17 +206,11 @@ System Requirement
[ActivePerl]: https://www.activestate.com/products/perl/
[File::MMagic]: https://metacpan.org/pod/File::MMagic
[GnuWin32]: http://gnuwin32.sourceforge.net
[IO::Compress::Gzip]: https://metacpan.org/pod/IO::Compress::Gzip
[IO::Uncompress::Gunzip]: https://metacpan.org/pod/IO::Uncompress::Gunzip
[Compress::Zlib]: https://metacpan.org/pod/Compress::Zlib
[the gzip website]: https://www.gzip.org
[IO-Compress]: https://metacpan.org/dist/IO-Compress
[IO::Compress::Bzip2]: https://metacpan.org/pod/IO::Compress::Bzip2
[IO::Uncompress::Bunzip2]: https://metacpan.org/pod/IO::Uncompress::Bunzip2
[IO-Compress]: https://metacpan.org/release/IO-Compress
[Compress::Bzip2]: https://metacpan.org/pod/Compress::Bzip2
[the bzip2 website]: http://www.bzip.org
[IO::Compress::Xz]: https://metacpan.org/pod/IO::Compress::Xz
[IO::Uncompress::UnXz]: https://metacpan.org/pod/IO::Uncompress::UnXz
[IO-Compress-Lzma]: https://metacpan.org/dist/IO-Compress-Lzma
[the XZ Utils website]: https://tukaani.org/xz/
[Term::ReadKey]: https://metacpan.org/pod/Term::ReadKey
@ -417,8 +373,7 @@ Options
The log file to be resolved. You can specify multiple log files.
If not specified, it reads from `STDIN` and outputs to `STDOUT`.
You can also specify `-` to read from `STDIN`. Result of `STDIN`
goes to `STDOUT`. `gzip`, `bzip2`, or `xz` compressed files are
supported.
goes to `STDOUT`. `gzip` or `bzip2` compressed files are supported.
* `-k`, `--keep mode`
@ -525,7 +480,7 @@ Thanks
License
-------
Copyright (C) 2000-2022 imacat.
Copyright (C) 2000-2021 imacat.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.

697
reslog
View File

File diff suppressed because it is too large Load Diff

6
t/01-exhaust.t
View File

@ -1,7 +1,7 @@
#! /usr/bin/perl -w
# Test all the possible combination of options
# Copyright (c) 2005-2022 imacat.
# Copyright (c) 2005-2021 imacat.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@ -23,7 +23,7 @@ use warnings;
use diagnostics;
use Test;
BEGIN { plan tests => 1788 }
BEGIN { plan tests => 1341 }
use File::Basename qw(basename);
use File::Path qw(mkpath rmtree);
@ -193,7 +193,7 @@ foreach my $st (@SOURCE_TYPES) {
die unless $_ || $$st{"skip"};
}
# 149: From STDIN to STDOUT
# 85: From STDIN to STDOUT
$_ = eval {
return if $$st{"skip"};
my ($title, $cmd, $ret_no, $out, $err, $logfile, $result);

27
t/02-several.t
View File

@ -1,7 +1,7 @@
#! /usr/bin/perl -w
# Test processing several log files at once
# Copyright (c) 2007-2022 imacat.
# Copyright (c) 2007-2021 imacat.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@ -23,7 +23,7 @@ use warnings;
use diagnostics;
use Test;
BEGIN { plan tests => 5 }
BEGIN { plan tests => 4 }
use File::Basename qw(basename);
use File::Path qw(mkpath rmtree);
@ -48,15 +48,13 @@ $_ = eval {
$suf = "." . random_word;
do { $trim_suf = "." . random_word; } until $trim_suf ne $suf;
# (2-4 times available compression) log files
$_ = 2 + (has_no_gzip? 0: 2) + (has_no_bzip2? 0: 2)
+ (has_no_xz? 0: 2);
$_ = 2 + (has_no_gzip? 0: 2) + (has_no_bzip2? 0: 2);
$num = $_ + int rand $_;
my %types = qw();
# At least 2 files for each available compression
foreach my $st (@SOURCE_TYPES) {
next if ($$st{"type"} eq TYPE_GZIP && has_no_gzip)
|| ($$st{"type"} eq TYPE_BZIP2 && has_no_bzip2)
|| ($$st{"type"} eq TYPE_XZ && has_no_xz);
|| ($$st{"type"} eq TYPE_BZIP2 && has_no_bzip2);
@_ = grep !exists $types{$_}, (0...$num-1);
$types{$_[int rand @_]} = $st;
@_ = grep !exists $types{$_}, (0...$num-1);
@ -67,8 +65,7 @@ $_ = eval {
do {
$types{$_} = $SOURCE_TYPES[int rand @SOURCE_TYPES];
} until !(${$types{$_}}{"type"} eq TYPE_GZIP && has_no_gzip)
&& !(${$types{$_}}{"type"} eq TYPE_BZIP2 && has_no_bzip2)
&& !(${$types{$_}}{"type"} eq TYPE_XZ && has_no_xz);
&& !(${$types{$_}}{"type"} eq TYPE_BZIP2 && has_no_bzip2);
}
@st = map $types{$_}, (0...$num-1);
@fs = qw();
@ -125,15 +122,14 @@ $_ = eval {
ok($_, 1, $@);
clean_up $_, $WORKDIR, ++$tno;
# 2-5: One of the source log files is read from STDIN
# 2-4: One of the source log files is read from STDIN
# The file type at STDIN
foreach my $st_stdin (@SOURCE_TYPES) {
my $skip;
$skip = 0;
$_ = eval {
if ( ($$st_stdin{"type"} eq TYPE_GZIP && has_no_gzip)
|| ($$st_stdin{"type"} eq TYPE_BZIP2 && has_no_bzip2)
|| ($$st_stdin{"type"} eq TYPE_XZ && has_no_xz)) {
|| ($$st_stdin{"type"} eq TYPE_BZIP2 && has_no_bzip2)) {
$skip = 1;
return;
}
@ -147,15 +143,13 @@ foreach my $st_stdin (@SOURCE_TYPES) {
$suf = "." . random_word;
do { $trim_suf = "." . random_word; } until $trim_suf ne $suf;
# (2-4 times available compression) log files
$_ = 2 + (has_no_gzip? 0: 2) + (has_no_bzip2? 0: 2)
+ (has_no_xz? 0: 2);
$_ = 2 + (has_no_gzip? 0: 2) + (has_no_bzip2? 0: 2);
$num = $_ + int rand $_;
my %types = qw();
# At least 2 files for each available compression
foreach my $st (@SOURCE_TYPES) {
next if ($$st{"type"} eq TYPE_GZIP && has_no_gzip)
|| ($$st{"type"} eq TYPE_BZIP2 && has_no_bzip2)
|| ($$st{"type"} eq TYPE_XZ && has_no_xz);
|| ($$st{"type"} eq TYPE_BZIP2 && has_no_bzip2);
@_ = grep !exists $types{$_}, (0...$num-1);
$types{$_[int rand @_]} = $st;
@_ = grep !exists $types{$_}, (0...$num-1);
@ -166,8 +160,7 @@ foreach my $st_stdin (@SOURCE_TYPES) {
do {
$types{$_} = $SOURCE_TYPES[int rand @SOURCE_TYPES];
} until !(${$types{$_}}{"type"} eq TYPE_GZIP && has_no_gzip)
&& !(${$types{$_}}{"type"} eq TYPE_BZIP2 && has_no_bzip2)
&& !(${$types{$_}}{"type"} eq TYPE_XZ && has_no_xz);
&& !(${$types{$_}}{"type"} eq TYPE_BZIP2 && has_no_bzip2);
}
# Choose the STDIN from the matching compression
@_ = grep ${$types{$_}}{"type"} eq $$st_stdin{"type"}, (0...$num-1);

8
t/03-errors.t
View File

@ -1,7 +1,7 @@
#! /usr/bin/perl -w
# Test the errors that should be captured.
# Copyright (c) 2007-2022 imacat.
# Copyright (c) 2007-2021 imacat.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@ -21,7 +21,7 @@ use warnings;
use diagnostics;
use Test;
BEGIN { plan tests => 9 }
BEGIN { plan tests => 7 }
use File::Basename qw(basename);
use File::Path qw(mkpath rmtree);
@ -35,7 +35,7 @@ $WORKDIR = catdir($FindBin::Bin, "logs");
$reslog = catfile($FindBin::Bin, updir, "blib", "script", "reslog");
$tno = 0;
# 1-8: Trim suffix is the same as suffix
# 1-6: Trim suffix is the same as suffix
foreach my $st (@SOURCE_TYPES) {
# 1: Trim suffix is the same as suffix
$_ = eval {
@ -126,7 +126,7 @@ foreach my $st (@SOURCE_TYPES) {
clean_up $_ || $$st{"skip"}, $WORKDIR, ++$tno;
}
# 9: A same log file is specified more than once
# 7: A same log file is specified more than once
$_ = eval {
my ($title, $cmd, $ret_no, $out, $err, %logfiles);
my ($fr, $frb, @fle, $fle, $flr, %cef, %crf, %tef, %trf);

171
t/_helper.pm
View File

@ -1,6 +1,6 @@
# _helper.pm - A simple test suite helper
# Copyright (c) 2005-2022 imacat
# Copyright (c) 2005-2021 imacat
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@ -25,10 +25,10 @@ $VERSION = "0.05";
@EXPORT = qw(
read_file read_raw_file write_file write_raw_file
run_cmd where_is file_type list_files preserve_source clean_up
has_no_file has_no_gzip has_no_bzip2 has_no_xz
has_no_file has_no_gzip has_no_bzip2
make_log_file make_resolved_log_file make_empty_log_file
random_word
TYPE_TEXT TYPE_GZIP TYPE_BZIP2 TYPE_XZ
TYPE_TEXT TYPE_GZIP TYPE_BZIP2
@CONTENT_TYPES @SOURCE_TYPES @KEEP_MODES @OVERRIDE_MODES @SUFFICES @TRIM_SUFFIX);
# Prototype declaration
sub this_file();
@ -45,7 +45,6 @@ sub clean_up($$$);
sub has_no_file();
sub has_no_gzip();
sub has_no_bzip2();
sub has_no_xz();
sub make_log_file($);
sub make_resolved_log_file($);
sub make_empty_log_file($);
@ -61,18 +60,16 @@ use File::Spec::Functions qw(splitdir catdir catfile path);
use File::Temp qw(tempfile);
use Socket;
our (%WHERE_IS, $HAS_NO_FILE, $HAS_NO_GZIP, $HAS_NO_BZIP2, $HAS_NO_XZ, $RANDOM_IP);
our (%WHERE_IS, $HAS_NO_FILE, $HAS_NO_GZIP, $HAS_NO_BZIP2, $RANDOM_IP);
%WHERE_IS = qw();
undef $HAS_NO_FILE;
undef $HAS_NO_GZIP;
undef $HAS_NO_BZIP2;
undef $HAS_NO_XZ;
undef $RANDOM_IP;
use constant TYPE_TEXT => "text/plain";
use constant TYPE_GZIP => "application/x-gzip";
use constant TYPE_BZIP2 => "application/x-bzip2";
use constant TYPE_XZ => "application/x-xz";
our (@CONTENT_TYPES, @SOURCE_TYPES, @KEEP_MODES, @OVERRIDE_MODES, @SUFFICES,
@TRIM_SUFFIX);
@ -97,11 +94,7 @@ our (@CONTENT_TYPES, @SOURCE_TYPES, @KEEP_MODES, @OVERRIDE_MODES, @SUFFICES,
{ "title" => "bzip2 source",
"type" => TYPE_BZIP2,
"suf" => ".bz2",
"skip" => has_no_bzip2, },
{ "title" => "xz source",
"type" => TYPE_XZ,
"suf" => ".xz",
"skip" => has_no_xz, }, );
"skip" => has_no_bzip2, }, );
# All the keep mode information
@KEEP_MODES = (
{ "title" => "keep default",
@ -186,21 +179,29 @@ sub read_file($) {
# a gzip compressed file
if ($file =~ /\.gz$/) {
# IO::Uncompress::Gunzip
if (eval { require IO::Uncompress::Gunzip; 1; }) {
my $gz;
# Compress::Zlib
if (eval { require Compress::Zlib;
Compress::Zlib->import(qw(gzopen));
1; }) {
use Compress::Zlib qw(gzopen);
my ($FH, $gz);
$content = "";
$gz = IO::Uncompress::Gunzip->new($file)
or die this_file . ": $file: $IO::Uncompress::Gunzip::GunzipError";
$content = join "", <$gz>;
$gz->close or die this_file . ": $file: $IO::Uncompress::Gunzip::GunzipError";
open $FH, $file or die this_file . ": $file: $!";
$gz = gzopen($FH, "rb") or die this_file . ": $file: $!";
while (1) {
($gz->gzread($_, 10240) != -1)
or die this_file . ": $file: " . $gz->gzerror;
$content .= $_;
last if length $_ < 10240;
}
$gz->gzclose and die this_file . ": $file: " . $gz->gzerror;
return $content;
# gzip executable
} else {
my ($PH, $CMD);
$CMD = where_is "gzip";
$CMD = "\"$CMD\" -cdf \"$file\"";
$CMD = "\"$CMD\" -cd \"$file\"";
open $PH, "$CMD |" or die this_file . ": $CMD: $!";
$content = join "", <$PH>;
close $PH or die this_file . ": $CMD: $!";
@ -209,44 +210,29 @@ sub read_file($) {
# a bzip compressed file
} elsif ($file =~ /\.bz2$/) {
# IO::Uncompress::Bunzip2
if (eval { require IO::Uncompress::Bunzip2; 1; }) {
my $bz;
# Compress::Bzip2
if (eval { require Compress::Bzip2;
Compress::Bzip2->import(2.00);
Compress::Bzip2->import(qw(bzopen));
1; }) {
my ($FH, $bz);
$content = "";
$bz = IO::Uncompress::Bunzip2->new($file)
or die this_file . ": $file: $IO::Uncompress::Bunzip2::Bunzip2Error";
$content = join "", <$bz>;
$bz->close or die this_file . ": $file: $IO::Uncompress::Bunzip2::Bunzip2Error";
open $FH, $file or die this_file . ": $file: $!";
$bz = bzopen($FH, "rb") or die this_file . ": $file: $!";
while (1) {
($bz->bzread($_, 10240) != -1)
or die this_file . ": $file: " . $bz->bzerror;
$content .= $_;
last if length $_ < 10240;
}
$bz->bzclose and die this_file . ": $file: " . $bz->bzerror;
return $content;
# bzip2 executable
} else {
my ($PH, $CMD);
$CMD = where_is "bzip2";
$CMD = "\"$CMD\" -cdf \"$file\"";
open $PH, "$CMD |" or die this_file . ": $CMD: $!";
$content = join "", <$PH>;
close $PH or die this_file . ": $CMD: $!";
return $content;
}
# an xz compressed file
} elsif ($file =~ /\.xz$/) {
# IO::Uncompress::UnXz
if (eval { require IO::Uncompress::UnXz; 1; }) {
my $xz;
$content = "";
$xz = IO::Uncompress::UnXz->new($file)
or die this_file . ": $file: $IO::Uncompress::UnXz::UnXzError";
$content = join "", <$xz>;
$xz->close or die this_file . ": $file: $IO::Uncompress::UnXz::UnXzError";
return $content;
# xz executable
} else {
my ($PH, $CMD);
$CMD = where_is "xz";
$CMD = "\"$CMD\" -cdf \"$file\"";
$CMD = "bzip2 -cd \"$file\"";
open $PH, "$CMD |" or die this_file . ": $CMD: $!";
$content = join "", <$PH>;
close $PH or die this_file . ": $CMD: $!";
@ -289,14 +275,16 @@ sub write_file($$) {
# a gzip compressed file
if ($file =~ /\.gz$/) {
# IO::Compress::Gzip
if (eval { require IO::Compress::Gzip; 1; }) {
my $gz;
$gz = IO::Compress::Gzip->new($file, -Level => 9)
or die this_file . ": $file: $IO::Compress::Gzip::GzipError";
($gz->write($content) == length $content)
or die this_file . ": $file: $IO::Compress::Gzip::GzipError";
$gz->close or die this_file . ": $file: $IO::Compress::Gzip::GzipError";
# Compress::Zlib
if (eval { require Compress::Zlib;
Compress::Zlib->import(qw(gzopen));
1; }) {
my ($FH, $gz);
open $FH, ">$file" or die this_file . ": $file: $!";
$gz = gzopen($FH, "wb9") or die this_file . ": $file: $!";
($gz->gzwrite($content) == length $content)
or die this_file . ": $file: " . $gz->gzerror;
$gz->gzclose and die this_file . ": $file: " . $gz->gzerror;
return;
# gzip executable
@ -312,44 +300,26 @@ sub write_file($$) {
# a bzip compressed file
} elsif ($file =~ /\.bz2$/) {
# IO::Compress::Bzip2
if (eval { require IO::Compress::Bzip2; 1; }) {
my $bz;
$bz = IO::Compress::Bzip2->new($file, BlockSize100K => 9)
or die this_file . ": $file: $IO::Compress::Bzip2::Bzip2Error";
($bz->write($content) == length $content)
or die this_file . ": $file: $IO::Compress::Bzip2::Bzip2Error";
$bz->close or die this_file . ": $file: $IO::Compress::Bzip2::Bzip2Error";
# Compress::Bzip2
if (eval { require Compress::Bzip2;
Compress::Bzip2->import(2.00);
Compress::Bzip2->import(qw(bzopen));
1; }) {
my ($FH, $bz);
open $FH, ">$file" or die this_file . ": $file: $!";
$bz = bzopen($FH, "wb9") or die this_file . ": $file: $!";
if ($content ne "") {
($bz->bzwrite($content, length $content) == length $content)
or die this_file . ": $file: " . $bz->bzerror;
}
$bz->bzclose and die this_file . ": $file: " . $bz->bzerror;
return;
# bzip2 executable
} else {
my ($PH, $CMD);
$CMD = where_is "bzip2";
$CMD = "\"$CMD\" -c9f > \"$file\"";
open $PH, "| $CMD" or die this_file . ": $CMD: $!";
print $PH $content or die this_file . ": $CMD: $!";
close $PH or die this_file . ": $CMD: $!";
return;
}
# an xz compressed file
} elsif ($file =~ /\.xz$/) {
# IO::Compress::Xz
if (eval { require IO::Compress::Xz; 1; }) {
my $xz;
$xz = IO::Compress::Xz->new($file, Extreme => 1)
or die this_file . ": $file: $IO::Compress::Xz::XzError";
($xz->write($content) == length $content)
or die this_file . ": $file: $IO::Compress::Xz::XzError";
$xz->close or die this_file . ": $file: $IO::Compress::Xz::XzError";
return;
# xz executable
} else {
my ($PH, $CMD);
$CMD = where_is "xz";
$CMD = "\"$CMD\" -c9f > \"$file\"";
$CMD = "\"$CMD\" -9f > \"$file\"";
open $PH, "| $CMD" or die this_file . ": $CMD: $!";
print $PH $content or die this_file . ": $CMD: $!";
close $PH or die this_file . ": $CMD: $!";
@ -448,7 +418,6 @@ sub file_type($) {
$_ = File::MMagic->new->checktype_filename($file);
return TYPE_GZIP if /gzip/;
return TYPE_BZIP2 if /bzip2/;
return TYPE_XZ if /xz/;
# All else are text/plain
return TYPE_TEXT;
}
@ -457,7 +426,6 @@ sub file_type($) {
$_ = join "", `"$_" "$file"`;
return TYPE_GZIP if /gzip/;
return TYPE_BZIP2 if /bzip2/;
return TYPE_XZ if /: XZ/;
# All else are text/plain
return TYPE_TEXT;
}
@ -531,31 +499,22 @@ sub has_no_file() {
# If we have gzip support somewhere
sub has_no_gzip() {
$HAS_NO_GZIP = eval { require IO::Compress::Gzip; require IO::Uncompress::Gunzip; 1; }
$HAS_NO_GZIP = eval { require Compress::Zlib; 1; }
|| defined where_is "gzip"?
0: "IO::Compress::Gzip or gzip executable not available"
0: "Compress::Zlib or gzip executable not available"
if !defined $HAS_NO_GZIP;
return $HAS_NO_GZIP;
}
# If we have bzip2 support somewhere
sub has_no_bzip2() {
$HAS_NO_BZIP2 = eval { require IO::Compress::Bzip2; require IO::Uncompress::Bunzip2; 1; }
$HAS_NO_BZIP2 = eval { require Compress::Bzip2; Compress::Bzip2->import(2.00); 1; }
|| defined where_is "bzip2"?
0: "IO::Compress::Bzip2 v2 or bzip2 executable not available"
0: "Compress::Bzip2 v2 or bzip2 executable not available"
if !defined $HAS_NO_BZIP2;
return $HAS_NO_BZIP2;
}
# If we have xz support somewhere
sub has_no_xz() {
$HAS_NO_XZ = eval { require IO::Compress::Xz; require IO::Uncompress::UnXz; 1; }
|| defined where_is "xz"?
0: "IO::Compress::Xz or xz executable not available"
if !defined $HAS_NO_XZ;
return $HAS_NO_XZ;
}
# Create a normal random log file
sub make_log_file($) {
local ($_, %_);