X-Git-Url: http://git.rot13.org/?p=BackupPC.git;a=blobdiff_plain;f=bin%2FBackupPC_nightly;fp=bin%2FBackupPC_nightly;h=22782d1330ebd80c99adbf7507c9539bb083477b;hp=19d1879040ae15f4223499d8fc476779727084b9;hb=3f3d4f4adbd990e15969d9cbc5e99e89e613e502;hpb=c2b072c9ad558447fb73fedf0cad170214b7d80e diff --git a/bin/BackupPC_nightly b/bin/BackupPC_nightly index 19d1879..22782d1 100755 --- a/bin/BackupPC_nightly +++ b/bin/BackupPC_nightly @@ -64,11 +64,10 @@ use strict; no utf8; use lib "/usr/local/BackupPC/lib"; -use BackupPC::Lib; +use BackupPC::Lib qw( :BPC_DT_ALL ); use BackupPC::FileZIO; use Getopt::Std; -use File::Find; use File::Path; use Data::Dumper; @@ -153,7 +152,7 @@ for my $pool ( qw(pool cpool) ) { $fileLinkMax = 0; $fileCntRename = 0; %FixList = (); - find({wanted => \&GetPoolStats}, "$TopDir/$pool/$dir") + $bpc->find({wanted => \&GetPoolStats}, "$TopDir/$pool/$dir") if ( -d "$TopDir/$pool/$dir" ); my $kb = $blkCnt / 2; my $kbRm = $blkCntRm / 2; @@ -260,7 +259,8 @@ sub doBackupInfoUpdate sub GetPoolStats { - my($inode, $nlinks, $nblocks) = (lstat($_))[1, 3, 12]; + my($file, $fullPath) = @_; + my($inode, $nlinks, $nblocks) = (lstat($file))[1, 3, 12]; if ( -d _ ) { $dirCnt++; @@ -279,7 +279,6 @@ sub GetPoolStats # pool files vs removing pool files. (Other aspects of the # design should eliminate race conditions.) # - my $fullPath = $File::Find::name; push(@PendingDelete, { inode => $inode, path => $fullPath