projects
/
BackupPC.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* lots of minor changes to prepare for 3.0.0beta0 release
[BackupPC.git]
/
bin
/
BackupPC_compressPool
diff --git
a/bin/BackupPC_compressPool
b/bin/BackupPC_compressPool
index
07f8661
..
8d173e1
100755
(executable)
--- a/
bin/BackupPC_compressPool
+++ b/
bin/BackupPC_compressPool
@@
-1,4
+1,4
@@
-#!/bin/perl
-T
+#!/bin/perl
#============================================================= -*-perl-*-
#
# BackupPC_compressPool: Compress existing pool
#============================================================= -*-perl-*-
#
# BackupPC_compressPool: Compress existing pool
@@
-31,7
+31,7
@@
# Craig Barratt <cbarratt@users.sourceforge.net>
#
# COPYRIGHT
# Craig Barratt <cbarratt@users.sourceforge.net>
#
# COPYRIGHT
-# Copyright (C) 2001 Craig Barratt
+# Copyright (C) 2001
-2003
Craig Barratt
#
# 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
#
# 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
@@
-49,13
+49,14
@@
#
#========================================================================
#
#
#========================================================================
#
-# Version
2.0.0_CVS, released 18 Jan 2003
.
+# Version
3.0.0beta0, released 11 Jul 2006
.
#
# See http://backuppc.sourceforge.net.
#
#========================================================================
use strict;
#
# See http://backuppc.sourceforge.net.
#
#========================================================================
use strict;
+no utf8;
use File::Find;
use File::Path;
use File::Find;
use File::Path;
@@
-68,6
+69,7
@@
use BackupPC::FileZIO;
die("BackupPC::Lib->new failed\n") if ( !(my $bpc = BackupPC::Lib->new) );
$bpc->ChildInit();
my $TopDir = $bpc->TopDir();
die("BackupPC::Lib->new failed\n") if ( !(my $bpc = BackupPC::Lib->new) );
$bpc->ChildInit();
my $TopDir = $bpc->TopDir();
+my $LogDir = $bpc->LogDir();
my $BinDir = $bpc->BinDir();
my %Conf = $bpc->Conf();
my $PoolDir = "$TopDir/pool";
my $BinDir = $bpc->BinDir();
my %Conf = $bpc->Conf();
my $PoolDir = "$TopDir/pool";
@@
-178,6
+180,7
@@
sub doCompress
$Errors++;
return;
}
$Errors++;
return;
}
+ binmode(FH);
while ( sysread(FH, $dataIn, $CompMaxWrite) > 0 ) {
$flush = 0;
$FileOrigSz += length($dataIn);
while ( sysread(FH, $dataIn, $CompMaxWrite) > 0 ) {
$flush = 0;
$FileOrigSz += length($dataIn);
@@
-202,6
+205,7
@@
sub doCompress
close(FH);
return;
}
close(FH);
return;
}
+ binmode(OUT);
$copy = 1;
}
if ( $copy && $dataOut ne "" ) {
$copy = 1;
}
if ( $copy && $dataOut ne "" ) {
@@
-244,6
+248,7
@@
sub doCompress
unlink("$file.__z");
return;
}
unlink("$file.__z");
return;
}
+ binmode(FH);
}
if ( $copy ) {
if ( !sysseek(OUT, 0, 0) ) {
}
if ( $copy ) {
if ( !sysseek(OUT, 0, 0) ) {
@@
-329,6
+334,7
@@
sub checkRead
$f->close();
return;
}
$f->close();
return;
}
+ binmode(FH);
#print("comparing $file to $cfile\n");
while ( 1 ) {
$n = 1 + int(rand($CompMaxRead) + rand(100));
#print("comparing $file to $cfile\n");
while ( 1 ) {
$n = 1 + int(rand($CompMaxRead) + rand(100));
@@
-363,6
+369,7
@@
sub checkReadLine
$f->close();
return;
}
$f->close();
return;
}
+ binmode(FH);
while ( 1 ) {
$d0 = <FH>;
$d = $f->readLine();
while ( 1 ) {
$d0 = <FH>;
$d = $f->readLine();
@@
-393,8
+400,8
@@
sub compressHostFiles
if ( !defined($host) ) {
for ( my $i = 0 ; ; $i++ ) {
if ( !defined($host) ) {
for ( my $i = 0 ; ; $i++ ) {
- last if ( !-f "$
TopDir/log
/LOG.$i" );
- push(@Files, "$
TopDir/log
/LOG.$i");
+ last if ( !-f "$
LogDir
/LOG.$i" );
+ push(@Files, "$
LogDir
/LOG.$i");
}
} else {
@Backups = $bpc->BackupInfoRead($host);
}
} else {
@Backups = $bpc->BackupInfoRead($host);