X-Git-Url: http://git.rot13.org/?p=BackupPC.git;a=blobdiff_plain;f=lib%2FBackupPC%2FXfer%2FRsync.pm;h=d629cd39afd490634e714d4457de82537502a709;hp=e8b605adf78b045dabc1679479f283bf64a091fd;hb=d6dd48e6594d937dea49e3dd1c5ddaba6719df0d;hpb=613c6ee622bcfc96a126d8df00b1455f4cdb4b97

diff --git a/lib/BackupPC/Xfer/Rsync.pm b/lib/BackupPC/Xfer/Rsync.pm
index e8b605a..d629cd3 100644
--- a/lib/BackupPC/Xfer/Rsync.pm
+++ b/lib/BackupPC/Xfer/Rsync.pm
@@ -278,7 +278,7 @@ sub start
     #
     $t->{rsyncClientCmd} = $rsyncClientCmd;
     $t->{rs} = File::RsyncP->new({
-	logLevel     => $conf->{RsyncLogLevel},
+	logLevel     => $t->{logLevel} || $conf->{RsyncLogLevel},
 	rsyncCmd     => sub {
 			    $bpc->verbose(0);
 			    $bpc->cmdExecOrEval($rsyncClientCmd, $args);
@@ -287,11 +287,25 @@ sub start
 	rsyncArgs    => $rsyncArgs,
 	timeout      => $conf->{ClientTimeout},
 	doPartial    => defined($t->{partialNum}) ? 1 : undef,
-	logHandler   => sub {
-			    my($str) = @_;
-			    $str .= "\n";
-			    $t->{XferLOG}->write(\$str);
-		        },
+	logHandler   =>
+                sub {
+                    my($str) = @_;
+                    $str .= "\n";
+                    $t->{XferLOG}->write(\$str);
+                    if ( $str =~ /^Remote\[1\]: read errors mapping "(.*)"/ ) {
+                        #
+                        # Files with read errors (eg: region locked files
+                        # on WinXX) are filled with 0 by rsync.  Remember
+                        # them and delete them later.
+                        #
+                        my $badFile = $1;
+                        $badFile =~ s/^\/+//;
+                        push(@{$t->{badFiles}}, {
+                                share => $t->{shareName},
+                                file  => $badFile
+                            });
+                    }
+                },
 	pidHandler   => sub {
 			    $t->{pidHandler}(@_);
 			},
@@ -300,7 +314,8 @@ sub start
 			    bpc        => $t->{bpc},
 			    conf       => $t->{conf},
 			    backups    => $t->{backups},
-			    logLevel   => $conf->{RsyncLogLevel},
+			    logLevel   => $t->{logLevel}
+                                              || $conf->{RsyncLogLevel},
 			    logHandler => sub {
 					      my($str) = @_;
 					      $str .= "\n";
@@ -427,6 +442,15 @@ sub run
     }
 }
 
+sub abort
+{
+    my($t, $reason) = @_;
+    my $rs = $t->{rs};
+
+    $rs->abort($reason);
+    return 1;
+}
+
 sub setSelectMask
 {
     my($t, $FDreadRef) = @_;