--- psinib.pl	2003/07/15 17:40:32	1.9
+++ psinib.pl	2003/10/12 16:13:38	1.12
@@ -33,7 +33,8 @@
 #$LOG = '/tmp/backup.log';
 
 # store backups in which directory
-my $BACKUP_DEST = '/backup/isis_backup';
+#my $BACKUP_DEST = '/backup/isis_backup';
+my $BACKUP_DEST = '/tmp/backup/';
 
 # files to ignore in backup
 my @ignore = ('.md5sum', '.backupignore', 'backupignore.txt');
@@ -50,7 +51,7 @@
 	sleep 1;
 	redo if ++$c < 10;
 	# no response for 10 sec, bail out
-	print STDERR "can't take lock on $LOG -- another $0 running?\n";
+	xlog("ABORT","can't take lock on $LOG -- another $0 running?");
 	exit 1;
 }
 
@@ -81,7 +82,7 @@
 	next if !/^\s*smbmount\s/;
 	my (undef,$share,undef,$opt) = split(/\s+/,$_,4);
 
-	my ($user,$passwd,$workgroup);
+	my ($user,$passwd,$workgroup,$ip);
 
 	foreach (split(/,/,$opt)) {
 		my ($n,$v) = split(/=/,$_,2);
@@ -97,6 +98,8 @@
 			}
 		} elsif ($n =~ m#workgroup#i) {
 			$workgroup = $v;
+		} elsif ($n =~ m#ip#i) {
+			$ip = $v;
 		}
 	}
 
@@ -121,14 +124,15 @@
 
 	print "working on $share\n";
 
-
-	my $ip = get_ip($share);
+	# try to nmblookup IP
+	$ip = get_ip($share) if (! $ip);
 
 	if ($ip) {
 		xlog($share,"IP is $ip");
 		if ($p->ping($ip)) {
-			snap_share($share,$user,$passwd,$workgroup);
-			$backup_ok++;
+			if (snap_share($share,$user,$passwd,$workgroup)) {
+				$backup_ok++;
+			}
 		}
 	}
 }
@@ -227,7 +231,7 @@
 
 	if (-l $bc && $real_bl && $real_bl eq $bc) {
 		print "$share allready backuped...\n";
-		return;
+		return 1;
 	}
 
 	die "You should really create BACKUP_DEST [$BACKUP_DEST] by hand! " if (!-e $BACKUP_DEST);
@@ -316,7 +320,7 @@
 				} elsif (-d $pf) {
 					push @dirs,$pr;
 				} else {
-					print STDERR "unknown type: $pf\n";
+					print STDERR "not file or directory: $pf\n";
 				}
 			} else {
 				print STDERR "ignored: $pr\n";
@@ -324,7 +328,8 @@
 		}
 	}
 
-	xlog($share,($#files+1)." files and ".($#dirs+1)." dirs on local disk before backup");
+	# local dir always include /
+	xlog($share,($#files+1)." files and ".($#dirs)." dirs on local disk before backup");
 
 	# read smb filesystem
 
@@ -339,10 +344,10 @@
 		my $pf = norm_dir($d,"smb:$share/");	# path full
 		my $D = $smb->opendir($pf);
 		if (! $D) {
-			xlog($share,"FATAL: $share: $!");
+			xlog($share,"FATAL: $share [$pf]: $!");
 			# remove failing dir
 			delete $smb_dirs[$di];
-			next;
+			return 0;			# failed
 		}
 		$di++;
 
@@ -362,7 +367,7 @@
 				} elsif ($item->[0] == main::SMBC_DIR) {
 					push @smb_dirs,$pr;
 				} else {
-					print STDERR "unknown type: $pf\n";
+					print STDERR "not file or directory [",$item->[0],"]: $pf\n";
 				}
 			} else {
 				print STDERR "smb ignored: $pr\n";
@@ -370,7 +375,7 @@
 		}
 	}
 
-	xlog($share,($#smb_files+1)." files and ".($#smb_dirs+1)." dirs on remote share");
+	xlog($share,($#smb_files+1)." files and ".($#smb_dirs)." dirs on remote share");
 
 	# sync dirs
 	my $lc = List::Compare->new(\@dirs, \@smb_dirs);
@@ -402,16 +407,16 @@
 		
 		foreach my $f (@_) {
 #print "smb_copy $from/$f -> $to/$f\n";
-			if (! open(F,"> $to/$f")) {
-				print STDERR "can't open new file $to/$f: $!\n";
-				next;
-			}
-
 			my $md5 = Digest::MD5->new;
 
 			my $fd = $smb->open("$from/$f");
 			if (! $fd) {
-				print STDERR "can't open smb file $from/$f: $!\n";
+				xlog("WARNING","can't open smb file $from/$f: $!");
+				next;
+			}
+
+			if (! open(F,"> $to/$f")) {
+				xlog("WARNING","can't open new file $to/$f: $!");
 				next;
 			}
 
@@ -503,7 +508,7 @@
 	foreach my $f (sort { $file_md5{$a} cmp $file_md5{$b} } keys %file_md5) {
 		my $dir = dirname($f);
 		my $file = basename($f);
-print "$f -- $dir / $file<--\n";
+#print "$f -- $dir / $file<--\n";
 		if ($dir ne $last_dir) {
 			close($md5) if ($md5);
 			open($md5, ">> $bc/$dir/.md5sum") || warn "can't create $bc/$dir/.md5sum: $!";
@@ -512,7 +517,7 @@
 		}
 		print $md5 $file_md5{$f},"  $file\n";
 	}
-	close($md5);
+	close($md5) if ($md5);
 
 	# create leatest link
 #print "ln -s $bc $real_bl\n";
@@ -525,8 +530,9 @@
 	xlog($share,"failed to create latest symlink $bl -> $bc...") if (readlink($bl) ne $bc || ! -l $bl);
 
 	xlog($share,"backup completed...");
-}
 
+	return 1;
+}
 __END__
 #-------------------------------------------------------------------------