From d29fc837cef51c57811cd0805853a36dac9ea468 Mon Sep 17 00:00:00 2001 From: cbarratt Date: Wed, 8 Oct 2003 06:02:44 +0000 Subject: [PATCH] * Fixed stupid last-minute change in octal size conversion in Backup_tarExtract. --- ChangeLog | 7 +++++++ bin/BackupPC | 4 ++-- bin/BackupPC_compressPool | 4 ++-- bin/BackupPC_dump | 4 ++-- bin/BackupPC_link | 4 ++-- bin/BackupPC_nightly | 4 ++-- bin/BackupPC_restore | 4 ++-- bin/BackupPC_sendEmail | 4 ++-- bin/BackupPC_serverMesg | 4 ++-- bin/BackupPC_tarCreate | 4 ++-- bin/BackupPC_tarExtract | 13 +++++++++---- bin/BackupPC_trashClean | 4 ++-- bin/BackupPC_zcat | 4 ++-- bin/BackupPC_zipCreate | 4 ++-- cgi-bin/BackupPC_Admin | 4 ++-- lib/BackupPC/Attrib.pm | 2 +- lib/BackupPC/FileZIO.pm | 2 +- lib/BackupPC/Lib.pm | 10 +++++----- lib/BackupPC/PoolWrite.pm | 2 +- lib/BackupPC/View.pm | 2 +- lib/BackupPC/Xfer/Rsync.pm | 2 +- lib/BackupPC/Xfer/RsyncFileIO.pm | 2 +- lib/BackupPC/Xfer/Smb.pm | 2 +- lib/BackupPC/Xfer/Tar.pm | 2 +- lib/BackupPC/Zip/FileMember.pm | 2 +- makeDist | 4 ++-- 26 files changed, 58 insertions(+), 46 deletions(-) diff --git a/ChangeLog b/ChangeLog index b944d6a..f532b0c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -21,6 +21,13 @@ # Version __VERSION__, __RELEASEDATE__ #------------------------------------------------------------------------ +* Fixed stupid last-minute change in octal size conversion in + Backup_tarExtract. + +#------------------------------------------------------------------------ +# Version 2.0.1, 5 Oct 2003 +#------------------------------------------------------------------------ + * Fixed handling of >= 8GB files in BackupPC_tarExtract and >= 4GB files in BackupPC_tarCreate. diff --git a/bin/BackupPC b/bin/BackupPC index c604f41..427554f 100755 --- a/bin/BackupPC +++ b/bin/BackupPC @@ -47,7 +47,7 @@ # #======================================================================== # -# Version 2.0.1, released 5 Oct 2003. +# Version 2.0.2, released 6 Oct 2003. # # See http://backuppc.sourceforge.net. # @@ -56,7 +56,7 @@ use strict; no utf8; use vars qw(%Status %Info $Hosts); -use lib "/usr/local/BackupPC2.0.1/lib"; +use lib "/usr/local/BackupPC2.0.2/lib"; use BackupPC::Lib; use BackupPC::FileZIO; diff --git a/bin/BackupPC_compressPool b/bin/BackupPC_compressPool index 732273a..03fa9af 100755 --- a/bin/BackupPC_compressPool +++ b/bin/BackupPC_compressPool @@ -49,7 +49,7 @@ # #======================================================================== # -# Version 2.0.1, released 5 Oct 2003. +# Version 2.0.2, released 6 Oct 2003. # # See http://backuppc.sourceforge.net. # @@ -62,7 +62,7 @@ use File::Find; use File::Path; use Compress::Zlib; use Getopt::Std; -use lib "/usr/local/BackupPC2.0.1/lib"; +use lib "/usr/local/BackupPC2.0.2/lib"; use BackupPC::Lib; use BackupPC::FileZIO; diff --git a/bin/BackupPC_dump b/bin/BackupPC_dump index 19dbe76..ce6afe2 100755 --- a/bin/BackupPC_dump +++ b/bin/BackupPC_dump @@ -70,7 +70,7 @@ # #======================================================================== # -# Version 2.0.1, released 5 Oct 2003. +# Version 2.0.2, released 6 Oct 2003. # # See http://backuppc.sourceforge.net. # @@ -78,7 +78,7 @@ use strict; no utf8; -use lib "/usr/local/BackupPC2.0.1/lib"; +use lib "/usr/local/BackupPC2.0.2/lib"; use BackupPC::Lib; use BackupPC::FileZIO; use BackupPC::Xfer::Smb; diff --git a/bin/BackupPC_link b/bin/BackupPC_link index 1fd5bc3..29eecd6 100755 --- a/bin/BackupPC_link +++ b/bin/BackupPC_link @@ -39,7 +39,7 @@ # #======================================================================== # -# Version 2.0.1, released 5 Oct 2003. +# Version 2.0.2, released 6 Oct 2003. # # See http://backuppc.sourceforge.net. # @@ -47,7 +47,7 @@ use strict; no utf8; -use lib "/usr/local/BackupPC2.0.1/lib"; +use lib "/usr/local/BackupPC2.0.2/lib"; use BackupPC::Lib; use BackupPC::Attrib; use BackupPC::PoolWrite; diff --git a/bin/BackupPC_nightly b/bin/BackupPC_nightly index 2e21651..e9fcde7 100755 --- a/bin/BackupPC_nightly +++ b/bin/BackupPC_nightly @@ -35,7 +35,7 @@ # #======================================================================== # -# Version 2.0.1, released 5 Oct 2003. +# Version 2.0.2, released 6 Oct 2003. # # See http://backuppc.sourceforge.net. # @@ -43,7 +43,7 @@ use strict; no utf8; -use lib "/usr/local/BackupPC2.0.1/lib"; +use lib "/usr/local/BackupPC2.0.2/lib"; use BackupPC::Lib; use BackupPC::FileZIO; diff --git a/bin/BackupPC_restore b/bin/BackupPC_restore index 24927f2..a24ae86 100755 --- a/bin/BackupPC_restore +++ b/bin/BackupPC_restore @@ -29,7 +29,7 @@ # #======================================================================== # -# Version 2.0.1, released 5 Oct 2003. +# Version 2.0.2, released 6 Oct 2003. # # See http://backuppc.sourceforge.net. # @@ -37,7 +37,7 @@ use strict; no utf8; -use lib "/usr/local/BackupPC2.0.1/lib"; +use lib "/usr/local/BackupPC2.0.2/lib"; use BackupPC::Lib; use BackupPC::FileZIO; use BackupPC::Xfer::Smb; diff --git a/bin/BackupPC_sendEmail b/bin/BackupPC_sendEmail index d576ddc..659214c 100755 --- a/bin/BackupPC_sendEmail +++ b/bin/BackupPC_sendEmail @@ -31,7 +31,7 @@ # #======================================================================== # -# Version 2.0.1, released 5 Oct 2003. +# Version 2.0.2, released 6 Oct 2003. # # See http://backuppc.sourceforge.net. # @@ -39,7 +39,7 @@ use strict; no utf8; -use lib "/usr/local/BackupPC2.0.1/lib"; +use lib "/usr/local/BackupPC2.0.2/lib"; use BackupPC::Lib; use BackupPC::FileZIO; diff --git a/bin/BackupPC_serverMesg b/bin/BackupPC_serverMesg index 123f8be..b3907fb 100755 --- a/bin/BackupPC_serverMesg +++ b/bin/BackupPC_serverMesg @@ -43,7 +43,7 @@ # #======================================================================== # -# Version 2.0.1, released 5 Oct 2003. +# Version 2.0.2, released 6 Oct 2003. # # See http://backuppc.sourceforge.net. # @@ -51,7 +51,7 @@ use strict; no utf8; -use lib "/usr/local/BackupPC2.0.1/lib"; +use lib "/usr/local/BackupPC2.0.2/lib"; use BackupPC::Lib; use BackupPC::FileZIO; diff --git a/bin/BackupPC_tarCreate b/bin/BackupPC_tarCreate index d30c1d1..6e5b126 100755 --- a/bin/BackupPC_tarCreate +++ b/bin/BackupPC_tarCreate @@ -48,7 +48,7 @@ # #======================================================================== # -# Version 2.0.1, released 5 Oct 2003. +# Version 2.0.2, released 6 Oct 2003. # # See http://backuppc.sourceforge.net. # @@ -56,7 +56,7 @@ use strict; no utf8; -use lib "/usr/local/BackupPC2.0.1/lib"; +use lib "/usr/local/BackupPC2.0.2/lib"; use File::Path; use Getopt::Std; use BackupPC::Lib; diff --git a/bin/BackupPC_tarExtract b/bin/BackupPC_tarExtract index 2c2d186..c9dfa5c 100755 --- a/bin/BackupPC_tarExtract +++ b/bin/BackupPC_tarExtract @@ -27,7 +27,7 @@ # #======================================================================== # -# Version 2.0.1, released 5 Oct 2003. +# Version 2.0.2, released 6 Oct 2003. # # See http://backuppc.sourceforge.net. # @@ -35,7 +35,7 @@ use strict; no utf8; -use lib "/usr/local/BackupPC2.0.1/lib"; +use lib "/usr/local/BackupPC2.0.2/lib"; use BackupPC::Lib; use BackupPC::Attrib qw(:all); use BackupPC::FileZIO; @@ -182,8 +182,13 @@ sub TarReadFileInfo # To avoid integer overflow in case we are in the 4GB - 8GB # range, we do the conversion in two parts. # - $size = oct(substr($size, 0, 2)) * (1 << 24) - + oct(substr($size, 3)); + if ( $size =~ /([0-9]{9,})/ ) { + my $len = length($1); + $size = oct(substr($1, 0, $len - 8)) * (1 << 24) + + oct(substr($1, $len - 8)); + } else { + $size = oct($size); + } } $mtime = oct $mtime; $chksum = oct $chksum; diff --git a/bin/BackupPC_trashClean b/bin/BackupPC_trashClean index 26e6bc4..e137785 100755 --- a/bin/BackupPC_trashClean +++ b/bin/BackupPC_trashClean @@ -29,7 +29,7 @@ # #======================================================================== # -# Version 2.0.1, released 5 Oct 2003. +# Version 2.0.2, released 6 Oct 2003. # # See http://backuppc.sourceforge.net. # @@ -37,7 +37,7 @@ use strict; no utf8; -use lib "/usr/local/BackupPC2.0.1/lib"; +use lib "/usr/local/BackupPC2.0.2/lib"; use BackupPC::Lib; die("BackupPC::Lib->new failed\n") if ( !(my $bpc = BackupPC::Lib->new) ); diff --git a/bin/BackupPC_zcat b/bin/BackupPC_zcat index d157443..1cf2c03 100755 --- a/bin/BackupPC_zcat +++ b/bin/BackupPC_zcat @@ -32,7 +32,7 @@ # #======================================================================== # -# Version 2.0.1, released 5 Oct 2003. +# Version 2.0.2, released 6 Oct 2003. # # See http://backuppc.sourceforge.net. # @@ -41,7 +41,7 @@ use strict; no utf8; -use lib "/usr/local/BackupPC2.0.1/lib"; +use lib "/usr/local/BackupPC2.0.2/lib"; use Compress::Zlib; use BackupPC::FileZIO; diff --git a/bin/BackupPC_zipCreate b/bin/BackupPC_zipCreate index 5fd7864..3a0c51b 100755 --- a/bin/BackupPC_zipCreate +++ b/bin/BackupPC_zipCreate @@ -51,7 +51,7 @@ # #======================================================================== # -# Version 2.0.1, released 5 Oct 2003. +# Version 2.0.2, released 6 Oct 2003. # # See http://backuppc.sourceforge.net. # @@ -59,7 +59,7 @@ use strict; no utf8; -use lib "/usr/local/BackupPC2.0.1/lib"; +use lib "/usr/local/BackupPC2.0.2/lib"; use Archive::Zip qw(:ERROR_CODES); use File::Path; use Getopt::Std; diff --git a/cgi-bin/BackupPC_Admin b/cgi-bin/BackupPC_Admin index fe61de4..bc4f1e9 100755 --- a/cgi-bin/BackupPC_Admin +++ b/cgi-bin/BackupPC_Admin @@ -39,7 +39,7 @@ # #======================================================================== # -# Version 2.0.1, released 5 Oct 2003. +# Version 2.0.2, released 6 Oct 2003. # # See http://backuppc.sourceforge.net. # @@ -48,7 +48,7 @@ use strict; no utf8; use CGI; -use lib "/usr/local/BackupPC2.0.1/lib"; +use lib "/usr/local/BackupPC2.0.2/lib"; use BackupPC::Lib; use BackupPC::FileZIO; use BackupPC::Attrib qw(:all); diff --git a/lib/BackupPC/Attrib.pm b/lib/BackupPC/Attrib.pm index 51be7f9..b7fe4db 100644 --- a/lib/BackupPC/Attrib.pm +++ b/lib/BackupPC/Attrib.pm @@ -30,7 +30,7 @@ # #======================================================================== # -# Version 2.0.1, released 5 Oct 2003. +# Version 2.0.2, released 6 Oct 2003. # # See http://backuppc.sourceforge.net. # diff --git a/lib/BackupPC/FileZIO.pm b/lib/BackupPC/FileZIO.pm index 108f429..35ceb7d 100644 --- a/lib/BackupPC/FileZIO.pm +++ b/lib/BackupPC/FileZIO.pm @@ -29,7 +29,7 @@ # #======================================================================== # -# Version 2.0.1, released 5 Oct 2003. +# Version 2.0.2, released 6 Oct 2003. # # See http://backuppc.sourceforge.net. # diff --git a/lib/BackupPC/Lib.pm b/lib/BackupPC/Lib.pm index 4e8bfd8..849ee86 100644 --- a/lib/BackupPC/Lib.pm +++ b/lib/BackupPC/Lib.pm @@ -29,7 +29,7 @@ # #======================================================================== # -# Version 2.0.1, released 5 Oct 2003. +# Version 2.0.2, released 6 Oct 2003. # # See http://backuppc.sourceforge.net. # @@ -55,10 +55,10 @@ sub new my($topDir, $installDir, $noUserCheck) = @_; my $bpc = bless { - TopDir => $topDir || '/data/BackupPC2.0.1', - BinDir => $installDir || '/usr/local/BackupPC2.0.1', - LibDir => $installDir || '/usr/local/BackupPC2.0.1', - Version => '2.0.1', + TopDir => $topDir || '/data/BackupPC2.0.2', + BinDir => $installDir || '/usr/local/BackupPC2.0.2', + LibDir => $installDir || '/usr/local/BackupPC2.0.2', + Version => '2.0.2', BackupFields => [qw( num type startTime endTime nFiles size nFilesExist sizeExist nFilesNew sizeNew diff --git a/lib/BackupPC/PoolWrite.pm b/lib/BackupPC/PoolWrite.pm index 5e8e7a7..466de23 100644 --- a/lib/BackupPC/PoolWrite.pm +++ b/lib/BackupPC/PoolWrite.pm @@ -56,7 +56,7 @@ # #======================================================================== # -# Version 2.0.1, released 5 Oct 2003. +# Version 2.0.2, released 6 Oct 2003. # # See http://backuppc.sourceforge.net. # diff --git a/lib/BackupPC/View.pm b/lib/BackupPC/View.pm index c130036..7840c62 100644 --- a/lib/BackupPC/View.pm +++ b/lib/BackupPC/View.pm @@ -31,7 +31,7 @@ # #======================================================================== # -# Version 2.0.1, released 5 Oct 2003. +# Version 2.0.2, released 6 Oct 2003. # # See http://backuppc.sourceforge.net. # diff --git a/lib/BackupPC/Xfer/Rsync.pm b/lib/BackupPC/Xfer/Rsync.pm index 501c85f..a365b95 100644 --- a/lib/BackupPC/Xfer/Rsync.pm +++ b/lib/BackupPC/Xfer/Rsync.pm @@ -29,7 +29,7 @@ # #======================================================================== # -# Version 2.0.1, released 5 Oct 2003. +# Version 2.0.2, released 6 Oct 2003. # # See http://backuppc.sourceforge.net. # diff --git a/lib/BackupPC/Xfer/RsyncFileIO.pm b/lib/BackupPC/Xfer/RsyncFileIO.pm index f9ee17e..9380060 100644 --- a/lib/BackupPC/Xfer/RsyncFileIO.pm +++ b/lib/BackupPC/Xfer/RsyncFileIO.pm @@ -12,7 +12,7 @@ # #======================================================================== # -# Version 2.0.1, released 5 Oct 2003. +# Version 2.0.2, released 6 Oct 2003. # # See http://backuppc.sourceforge.net. # diff --git a/lib/BackupPC/Xfer/Smb.pm b/lib/BackupPC/Xfer/Smb.pm index d3c90ed..eec4447 100644 --- a/lib/BackupPC/Xfer/Smb.pm +++ b/lib/BackupPC/Xfer/Smb.pm @@ -29,7 +29,7 @@ # #======================================================================== # -# Version 2.0.1, released 5 Oct 2003. +# Version 2.0.2, released 6 Oct 2003. # # See http://backuppc.sourceforge.net. # diff --git a/lib/BackupPC/Xfer/Tar.pm b/lib/BackupPC/Xfer/Tar.pm index 204495b..3d8b968 100644 --- a/lib/BackupPC/Xfer/Tar.pm +++ b/lib/BackupPC/Xfer/Tar.pm @@ -29,7 +29,7 @@ # #======================================================================== # -# Version 2.0.1, released 5 Oct 2003. +# Version 2.0.2, released 6 Oct 2003. # # See http://backuppc.sourceforge.net. # diff --git a/lib/BackupPC/Zip/FileMember.pm b/lib/BackupPC/Zip/FileMember.pm index 94fb9f3..a97c2e1 100644 --- a/lib/BackupPC/Zip/FileMember.pm +++ b/lib/BackupPC/Zip/FileMember.pm @@ -33,7 +33,7 @@ # #======================================================================== # -# Version 2.0.1, released 5 Oct 2003. +# Version 2.0.2, released 6 Oct 2003. # # See http://backuppc.sourceforge.net. # diff --git a/makeDist b/makeDist index 27b9392..c6ee4c5 100755 --- a/makeDist +++ b/makeDist @@ -41,8 +41,8 @@ use File::Copy; umask(0022); -my $Version = "2.0.1"; -my $ReleaseDate = "5 Oct 2003"; +my $Version = "2.0.2"; +my $ReleaseDate = "6 Oct 2003"; my $DistDir = "dist/BackupPC-$Version"; my @PerlSrc = qw( -- 2.20.1