# Craig Barratt <cbarratt@users.sourceforge.net>
#
# COPYRIGHT
-# Copyright (C) 2001 Craig Barratt
+# Copyright (C) 2001-2003 Craig Barratt
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
#
#========================================================================
#
-# Version 2.0.0beta2, released 13 Apr 2003.
+# Version 2.1.0_CVS, released 13 Mar 2004.
#
# See http://backuppc.sourceforge.net.
#
};
}
}
+ $t->{fileIncludeHash} = {};
if ( defined($conf->{BackupFilesOnly}{$t->{shareName}}) ) {
foreach my $file ( @{$conf->{BackupFilesOnly}{$t->{shareName}}} ) {
push(@fileList, $file);
+ $t->{fileIncludeHash}{$file} = 1;
}
} elsif ( defined($conf->{BackupFilesExclude}{$t->{shareName}}) ) {
foreach my $file ( @{$conf->{BackupFilesExclude}{$t->{shareName}}} )
#
# Run smbclient.
#
+ alarm(0);
$bpc->cmdExecOrEval($smbClientCmd, $args);
# should not be reached, but just in case...
$t->{_errStr} = "Can't exec $conf->{SmbClientPath}";
while ( $t->{smbOut} =~ /(.*?)[\n\r]+(.*)/s ) {
$_ = $1;
$t->{smbOut} = $2;
- $t->{XferLOG}->write(\"$_\n");
+ #
+ # ignore the log file time stamps from smbclient introduced
+ # in version 3.0.0 - don't even write them to the log file.
+ #
+ if ( m{^\[\d+/\d+/\d+ +\d+:\d+:\d+.*\] +(client/cli|lib/util_unistr).*\(\d+\)} ) {
+ $t->{XferLOG}->write(\"$_\n") if ( $t->{logLevel} >= 5 );
+ next;
+ }
#
# refresh our inactivity alarm
#
- alarm($conf->{ClientTimeout});
+ alarm($conf->{ClientTimeout}) if ( !$t->{abort} );
$t->{lastOutputLine} = $_ if ( !/^$/ );
#
# This section is highly dependent on the version of smbclient.
# If you upgrade Samba, make sure that these regexp are still valid.
#
- if ( /^\s*(-?\d+) \(\s*\d+\.\d kb\/s\) (.*)$/ ) {
+ if ( /^\s*(-?\d+) \(\s*\d+[.,]\d kb\/s\) (.*)$/ ) {
my $sambaFileSize = $1;
my $pcFileName = $2;
(my $fileName = $pcFileName) =~ s/\\/\//g;
$fileName =~ s/^\/*//;
$t->{byteCnt} += $sambaFileSize;
$t->{fileCnt}++;
+ $t->{XferLOG}->write(\"$_\n") if ( $t->{logLevel} >= 2 );
} elsif ( /restore tar file (.*) of size (\d+) bytes/ ) {
$t->{byteCnt} += $2;
$t->{fileCnt}++;
- } elsif ( /tar: dumped \d+ files/ ) {
+ $t->{XferLOG}->write(\"$_\n") if ( $t->{logLevel} >= 1 );
+ } elsif ( /^\s*tar: dumped \d+ files/ ) {
$t->{xferOK} = 1;
- } elsif ( /^tar: restored \d+ files/ ) {
+ $t->{XferLOG}->write(\"$_\n") if ( $t->{logLevel} >= 0 );
+ } elsif ( /^\s*tar: restored \d+ files/ ) {
$t->{xferOK} = 1;
- } elsif ( /^read_socket_with_timeout: timeout read. /i ) {
+ $t->{XferLOG}->write(\"$_\n") if ( $t->{logLevel} >= 0 );
+ } elsif ( /^\s*read_socket_with_timeout: timeout read. /i ) {
$t->{hostAbort} = 1;
+ $t->{XferLOG}->write(\"$_\n") if ( $t->{logLevel} >= 0 );
} elsif ( /^code 0 listing /
- || /^code 0 opening /
- || /^abandoning restore/i
- || /^Error: Looping in FIND_NEXT/i
- || /^SUCCESS - 0/i
- || /^Call timed out: server did not respond/i
+ || /^\s*code 0 opening /
+ || /^\s*abandoning restore/i
+ || /^\s*Error: Looping in FIND_NEXT/i
+ || /^\s*SUCCESS - 0/i
+ || /^\s*Call timed out: server did not respond/i
+ || /^\s*tree connect failed: ERRDOS - ERRnoaccess \(Access denied\.\)/
+ || /^\s*tree connect failed: NT_STATUS_BAD_NETWORK_NAME/
) {
- $t->{hostError} ||= $_;
+ if ( $t->{hostError} eq "" ) {
+ $t->{XferLOG}->write(\"This backup will fail because: $_\n");
+ $t->{hostError} = $_;
+ }
+ $t->{XferLOG}->write(\"$_\n") if ( $t->{logLevel} >= 0 );
+ } elsif ( /^\s*NT_STATUS_ACCESS_DENIED listing (.*)/
+ || /^\s*ERRDOS - ERRnoaccess \(Access denied\.\) listing (.*)/ ) {
+ my $badDir = $1;
+ $badDir =~ s{\\}{/}g;
+ $badDir =~ s{/+}{/}g;
+ $badDir =~ s{/\*$}{};
+ if ( $t->{hostError} eq ""
+ && ($badDir eq "" || $t->{fileIncludeHash}{$badDir}) ) {
+ $t->{XferLOG}->write(\"This backup will fail because: $_\n");
+ $t->{hostError} ||= $_;
+ }
+ $t->{XferLOG}->write(\"$_\n") if ( $t->{logLevel} >= 0 );
+ } elsif ( /^\s*directory \\/i ) {
+ $t->{XferLOG}->write(\"$_\n") if ( $t->{logLevel} >= 2 );
} elsif ( /smb: \\>/
- || /^added interface/i
- || /^tarmode is now/i
- || /^Total bytes written/i
- || /^Domain=/i
+ || /^\s*added interface/i
+ || /^\s*tarmode is now/i
+ || /^\s*Total bytes written/i
+ || /^\s*Domain=/i
|| /^\([\d\.]* kb\/s\) \(average [\d\.]* kb\/s\)$/i
- || /^Getting files newer than/i
- || /^\s+directory \\/i
- || /^Output is \/dev\/null/i
- || /^Timezone is/i ) {
+ || /^\s*Getting files newer than/i
+ || /^\s*restore directory \\/i
+ || /^\s*Output is \/dev\/null/i
+ || /^\s*Timezone is/i
+ || /^\s*creating lame (up|low)case table/i
+ ) {
# ignore these messages
+ $t->{XferLOG}->write(\"$_\n") if ( $t->{logLevel} >= 1 );
} else {
$t->{xferErrCnt}++;
$t->{xferBadShareCnt}++ if ( /^ERRDOS - ERRbadshare/ );
my $badFile = $1;
$badFile =~ s{\\}{/}g;
$badFile =~ s{^/}{};
- push(@{$t->{badFiles}}, "$t->{shareName}/$badFile");
+ push(@{$t->{badFiles}}, {
+ share => $t->{shareName},
+ file => $badFile
+ });
}
+ $t->{XferLOG}->write(\"$_\n") if ( $t->{logLevel} >= 1 );
}
}
return 1;
}
+sub abort
+{
+ my($t, $reason) = @_;
+
+ $t->{abort} = 1;
+ $t->{abortReason} = $reason;
+}
+
sub setSelectMask
{
my($t, $FDreadRef) = @_;
projects / BackupPC.git / blobdiff