#
#========================================================================
#
-# Version 2.1.0beta2, released 23 May 2004.
+# Version 3.0.0, released 28 Jan 2007.
#
# See http://backuppc.sourceforge.net.
#
sub new
{
- my($class, $bpc, $host, $backups) = @_;
+ my($class, $bpc, $host, $backups, $options) = @_;
my $m = bless {
- bpc => $bpc, # BackupPC::Lib object
- host => $host, # host name
- backups => $backups, # all backups for this host
- num => -1, # backup number
- idx => -1, # index into backups for backup
- # we are viewing
- dirPath => undef, # path to current directory
- dirAttr => undef, # attributes of current directory
+ bpc => $bpc, # BackupPC::Lib object
+ host => $host, # host name
+ backups => $backups, # all backups for this host
+ num => -1, # backup number
+ idx => -1, # index into backups for backup
+ # we are viewing
+ dirPath => undef, # path to current directory
+ dirAttr => undef, # attributes of current directory
+ dirOpts => $options, # $options is a hash of file attributes we need:
+ # type, inode, or nlink. If set, these parameters
+ # are added to the returned hash.
+ # See BackupPC::Lib::dirRead().
}, $class;
for ( my $i = 0 ; $i < @{$m->{backups}} ; $i++ ) {
next if ( defined($m->{backups}[$i]{level}) );
}
$path .= $sharePathM;
#print(STDERR "Opening $path (share=$share)\n");
- if ( !opendir(DIR, $path) ) {
+
+ my $dirInfo = $m->{bpc}->dirRead($path, $m->{dirOpts});
+ if ( !defined($dirInfo) ) {
if ( $i == $m->{idx} ) {
#
# Oops, directory doesn't exist.
}
next;
}
- my @dir = readdir(DIR);
- closedir(DIR);
my $attr;
if ( $mangle ) {
$attr = BackupPC::Attrib->new({ compress => $compress });
$attr = undef;
}
}
- foreach my $file ( @dir ) {
- $file = $1 if ( $file =~ /(.*)/ );
+ foreach my $entry ( @$dirInfo ) {
+ my $file = $1 if ( $entry->{name} =~ /(.*)/s );
my $fileUM = $file;
$fileUM = $m->{bpc}->fileNameUnmangle($fileUM) if ( $mangle );
#print(STDERR "Doing $fileUM\n");
next if ( defined($m->{files}{$fileUM})
|| $file eq ".."
|| $file eq "."
+ || $file eq "backupInfo"
|| $mangle && $file eq "attrib" );
- #
- # skip directories in earlier backups (each backup always
- # has the complete directory tree).
- #
- my @s = stat("$path/$file");
- next if ( $i < $m->{idx} && -d _ );
if ( defined($attr) && defined(my $a = $attr->get($fileUM)) ) {
$m->{files}{$fileUM} = $a;
+ #
+ # skip directories in earlier backups (each backup always
+ # has the complete directory tree).
+ #
+ next if ( $i < $m->{idx} && $a->{type} == BPC_FTYPE_DIR );
$attr->set($fileUM, undef);
} else {
#
# is on. We have to stat the file and read compressed files
# to determine their size.
#
+ my @s = stat("$path/$file");
+ next if ( $i < $m->{idx} && -d _ );
$m->{files}{$fileUM} = {
type => -d _ ? BPC_FTYPE_DIR : BPC_FTYPE_FILE,
mode => $s[2],
}
}
}
- $m->{files}{$fileUM}{relPath} = "$dir/$fileUM";
- $m->{files}{$fileUM}{sharePathM} = "$sharePathM/$file";
- $m->{files}{$fileUM}{fullPath} = "$path/$file";
- $m->{files}{$fileUM}{backupNum} = $backupNum;
- $m->{files}{$fileUM}{compress} = $compress;
- $m->{files}{$fileUM}{nlink} = $s[3];
- $m->{files}{$fileUM}{inode} = $s[1];
+ ($m->{files}{$fileUM}{relPath} = "$dir/$fileUM") =~ s{//+}{/}g;
+ ($m->{files}{$fileUM}{sharePathM} = "$sharePathM/$file")
+ =~ s{//+}{/}g;
+ ($m->{files}{$fileUM}{fullPath} = "$path/$file") =~ s{//+}{/}g;
+ $m->{files}{$fileUM}{backupNum} = $backupNum;
+ $m->{files}{$fileUM}{compress} = $compress;
+ $m->{files}{$fileUM}{nlink} = $entry->{nlink}
+ if ( $m->{dirOpts}{nlink} );
+ $m->{files}{$fileUM}{inode} = $entry->{inode}
+ if ( $m->{dirOpts}{inode} );
}
#
# Also include deleted files
my @dir = readdir(DIR);
closedir(DIR);
foreach my $file ( @dir ) {
- $file = $1 if ( $file =~ /(.*)/ );
+ $file = $1 if ( $file =~ /(.*)/s );
next if ( $file eq "attrib" && $mangle
|| $file eq "."
- || $file eq ".." );
+ || $file eq ".."
+ || $file eq "backupInfo"
+ );
my $fileUM = $file;
$fileUM = $m->{bpc}->fileNameUnmangle($fileUM) if ( $mangle );
push(@shareList, $fileUM);
my($m, $backupNum, $share, $path) = @_;
#print(STDERR "fileAttrib($backupNum, $share, $path)\n");
- if ( $path =~ s{(.*)/+(.+)}{$1} ) {
+ if ( $path =~ s{(.*)/+(.+)}{$1}s ) {
my $file = $2;
$m->dirCache($backupNum, $share, $path);
return $m->{files}{$file};
}
$path .= $sharePathM;
#print(STDERR "Opening $path (share=$share)\n");
- if ( !opendir(DIR, $path) ) {
+
+ my $dirInfo = $m->{bpc}->dirRead($path, $m->{dirOpts});
+ if ( !defined($dirInfo) ) {
#
# Oops, directory doesn't exist.
#
next;
}
- my @dir = readdir(DIR);
- closedir(DIR);
my $attr;
if ( $mangle ) {
$attr = BackupPC::Attrib->new({ compress => $compress });
$attr = undef;
}
}
- foreach my $file ( @dir ) {
- $file = $1 if ( $file =~ /(.*)/ );
+ foreach my $entry ( @$dirInfo ) {
+ my $file = $1 if ( $entry->{name} =~ /(.*)/s );
my $fileUM = $file;
$fileUM = $m->{bpc}->fileNameUnmangle($fileUM) if ( $mangle );
#print(STDERR "Doing $fileUM\n");
}
}
}
- $files->{$fileUM}[$i]{relPath} = "$dir/$fileUM";
- $files->{$fileUM}[$i]{sharePathM} = "$sharePathM/$file";
- $files->{$fileUM}[$i]{fullPath} = "$path/$file";
- $files->{$fileUM}[$i]{backupNum} = $backupNum;
- $files->{$fileUM}[$i]{compress} = $compress;
- $files->{$fileUM}[$i]{nlink} = $s[3];
- $files->{$fileUM}[$i]{inode} = $s[1];
+ ($files->{$fileUM}[$i]{relPath} = "$dir/$fileUM") =~ s{//+}{/}g;
+ ($files->{$fileUM}[$i]{sharePathM} = "$sharePathM/$file")
+ =~ s{//+}{/}g;
+ ($files->{$fileUM}[$i]{fullPath} = "$path/$file") =~ s{//+}{/}g;
+ $files->{$fileUM}[$i]{backupNum} = $backupNum;
+ $files->{$fileUM}[$i]{compress} = $compress;
+ $files->{$fileUM}[$i]{nlink} = $entry->{nlink}
+ if ( $m->{dirOpts}{nlink} );
+ $files->{$fileUM}[$i]{inode} = $entry->{inode}
+ if ( $m->{dirOpts}{inode} );
}
+ #
+ # Flag deleted files
+ #
+ if ( defined($attr) ) {
+ my $a = $attr->get;
+ foreach my $fileUM ( keys(%$a) ) {
+ next if ( $a->{$fileUM}{type} != BPC_FTYPE_DELETED );
+ $files->{$fileUM}[$i]{type} = BPC_FTYPE_DELETED;
+ }
+ }
+
#
# Merge old backups. Don't merge directories from old
# backups because every backup has an accurate directory
$files->{$fileUM}[$i] = $files->{$fileUM}[$k];
}
}
+ }
- #
- # Finally, remove deleted files
- #
- if ( defined($attr) ) {
- my $a = $attr->get;
- foreach my $fileUM ( keys(%$a) ) {
- next if ( $a->{$fileUM}{type} != BPC_FTYPE_DELETED );
- $files->{$fileUM}[$i] = undef if ( defined($files->{$fileUM}) );
- }
- }
+ #
+ # Remove deleted files
+ #
+ for ( $i = 0 ; $i < @{$m->{backups}} ; $i++ ) {
+ foreach my $fileUM ( keys(%$files) ) {
+ next if ( !defined($files->{$fileUM}[$i])
+ || $files->{$fileUM}[$i]{type} != BPC_FTYPE_DELETED );
+ $files->{$fileUM}[$i] = undef;
+ }
}
+
#print STDERR "Returning:\n", Dumper($files);
return $files;
}
projects / BackupPC.git / blobdiff