ambiser
/
btrbk
mirror of https://github.com/digint/btrbk
9
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

btrbk: fix vinfo_resolved 

Fix for rare cases:
- fix for paths named "0"
- return undef if not strictly below $vol (or allow_equal is set)
pull/286/head
Axel Burri 2019-05-22 23:02:36 +02:00
parent 461eaada66
commit 0439e6079f
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
btrbk
View File

@ -2779,7 +2779,7 @@ sub vinfo_subvol_list($;@)
} }
# returns vinfo_child if $node is in tree below $vol, or undef # returns vinfo_child if $node is in tree below $vol (or equal if allow_equal), or undef
sub vinfo_resolved($$;@) sub vinfo_resolved($$;@)
{ {
my $node = shift || die; my $node = shift || die;
@ -2792,9 +2792,13 @@ sub vinfo_resolved($$;@)
unshift(@path, $nn->{REL_PATH}); unshift(@path, $nn->{REL_PATH});
$nn = $nn->{TOP_LEVEL}; $nn = $nn->{TOP_LEVEL};
} }
if(scalar(@path) == 0) {
return $vol if($opts{allow_equal} && not defined($vol->{NODE_SUBDIR}));
return undef;
}
return undef if($nn->{is_root} && (!$vol->{node}{is_root})); return undef if($nn->{is_root} && (!$vol->{node}{is_root}));
my $jpath = join('/', @path); my $jpath = join('/', @path);
if($vol->{NODE_SUBDIR}) { if(defined($vol->{NODE_SUBDIR})) {
return undef unless($jpath =~ s/^\Q$vol->{NODE_SUBDIR}\E\///); return undef unless($jpath =~ s/^\Q$vol->{NODE_SUBDIR}\E\///);
} }
if(defined($opts{btrbk_direct_leaf})) { if(defined($opts{btrbk_direct_leaf})) {
@ -2820,7 +2824,7 @@ sub vinfo_resolved_all_mountpoints($$)
my $mnt_vol = vinfo($vol->{URL_PREFIX} . $mnt_path, $vol->{CONFIG}); my $mnt_vol = vinfo($vol->{URL_PREFIX} . $mnt_path, $vol->{CONFIG});
$mnt_vol->{node} = $mnt_node; $mnt_vol->{node} = $mnt_node;
TRACE "vinfo_resolved_all_mountpoints: trying mountpoint: $mnt_vol->{PRINT}"; TRACE "vinfo_resolved_all_mountpoints: trying mountpoint: $mnt_vol->{PRINT}";
my $vinfo = vinfo_resolved($node, $mnt_vol); my $vinfo = vinfo_resolved($node, $mnt_vol, allow_equal => 1);
return $vinfo if($vinfo); return $vinfo if($vinfo);
} }
return undef; return undef;