--- psinib.pl	2003/10/26 12:55:56	1.16
+++ psinib.pl	2003/10/27 18:58:41	1.18
@@ -62,12 +62,17 @@
 # taint path: nmblookup should be there!
 $ENV{'PATH'} = "/usr/bin:/bin";
 
-my $use_ping = 1;	# deault: use ping to verify that host is up
+my $use_ping = 1;	# default: use syn tcp ping to verify that host is up
+my $verbose = 1;	# default verbosity level
+my $quiet = 0;
 
 my $result = GetOptions(
         "ping!" => \$use_ping, "backupdest!" => \$BACKUP_DEST,
+	"verbose+" => \$verbose, "quiet+" => \$quiet,
 );
 
+$verbose -= $quiet;
+
 my $mounts = shift @ARGV ||
 	'mountscript';
 #	die "usage: $0 mountscript";
@@ -145,7 +150,7 @@
 		$real_bl=readlink($bl) || die "can't read link $bl: $!";
 		$real_bl="$BACKUP_DEST/$host/$dir/$real_bl" if (substr($real_bl,0,1) ne "/");
 		if (-l $bc && $real_bl eq $bc) {
-			print "$share allready backuped...\n";
+			xlog($share,"allready backuped...");
 			$backup_ok++;
 			next;
 		}
@@ -153,7 +158,7 @@
 	}
 
 
-	print "working on $share\n";
+	xlog($share,"working on $share...");
 
 	# try to nmblookup IP
 	$ip = get_ip($share) if (! $ip);
@@ -194,13 +199,15 @@
 	my $share = shift;
 	my $t = strftime $LOG_TIME_FMT, localtime;
 	my $m = shift || '[no log entry]';
-	print STDERR $m,"\n";
+	my $l = shift;
+	$l = 1 if (! defined $l);	# default verbosity is 1
+	print STDERR $m,"\n" if ($verbose >= $l);
 	print L "$t $share\t$m\n";
 }
 
 # dump warn and dies into log
-BEGIN { $SIG{'__WARN__'} = sub { xlog('WARN',$_[0]) ; warn $_[0] } }
-BEGIN { $SIG{'__DIE__'} = sub { xlog('DIE',$_[0]) ; die $_[0] } }
+BEGIN { $SIG{'__WARN__'} = sub { xlog('WARN',$_[0],1) ; warn $_[0] } }
+BEGIN { $SIG{'__DIE__'} = sub { xlog('DIE',$_[0],0) ; die $_[0] } }
 
 
 # split share name to host, dir and currnet date dir
@@ -213,7 +220,7 @@
 		$dir =~ s/^_+//;
 		$dir =~ s/_+$//;
 	} else {
-		print "Can't parse share $share into host and directory!\n";
+		xlog($share,"Can't parse share $share into host and directory!",1);
 		return;
 	}
 	return ($host,$dir,strftime $DIR_TIME_FMT, localtime);
@@ -242,13 +249,15 @@
 	if (-l $bl) {
 		$real_bl=readlink($bl) || die "can't read link $bl: $!";
 		$real_bl="$BACKUP_DEST/$host/$dir/$real_bl" if (substr($real_bl,0,1) ne "/");
-	} else {
-		print "no old backup, trying to find last backup, ";
+		undef $real_bl if (! -e $real_bl);
+	}
+	if (! $real_bl) {
+		xlog($share,"no old backup, trying to find last backup,");
 		if (opendir(BL_DIR, "$BACKUP_DEST/$host/$dir")) {
 			my @bl_dirs = sort grep { !/^\./ && -d "$BACKUP_DEST/$host/$dir/$_" } readdir(BL_DIR);
 			closedir(BL_DIR);
 			$real_bl=pop @bl_dirs;
-			print "using $real_bl as latest...\n";
+			xlog($share,"using $real_bl as latest...");
 			$real_bl="$BACKUP_DEST/$host/$dir/$real_bl" if (substr($real_bl,0,1) ne "/");
 			if ($real_bl eq $bc) {
 				xlog($share,"latest from today (possible partial backup)");
@@ -256,12 +265,12 @@
 				$real_bl .= ".partial";
 			}
 		} else {
-			print "this is first run...\n";
+			xlog($share,"this is first run...");
 		}
 	}
 
 	if (-l $bc && $real_bl && $real_bl eq $bc) {
-		print "$share allready backuped...\n";
+		xlog($share,"allready backuped...");
 		return 1;
 	}
 
@@ -269,12 +278,12 @@
 
 	if (! -e "$BACKUP_DEST/$host") {
 		mkdir "$BACKUP_DEST/$host" || die "can't make dir for host $host, $BACKUP_DEST/$host: $!";
-		print "created host directory $BACKUP_DEST/$host...\n";
+		xlog($share,"created host directory $BACKUP_DEST/$host...");
 	}
 
 	if (! -e "$BACKUP_DEST/$host/$dir") {
 		mkdir "$BACKUP_DEST/$host/$dir" || die "can't make dir for share $share, $BACKUP_DEST/$host/$dir $!";
-		print "created dir for share $share, $BACKUP_DEST/$host/$dir...\n";
+		xlog($share,"created dir for this share $BACKUP_DEST/$host/$dir...");
 	}
 
 	mkdir $bc || die "can't make dir for current backup $bc: $!";
@@ -352,10 +361,10 @@
 				} elsif (-d $pf) {
 					push @dirs,$pr;
 				} else {
-					print STDERR "not file or directory: $pf\n";
+					xlog($share,"not file or directory: $pf",0);
 				}
 			} else {
-				print STDERR "ignored: $pr\n";
+				xlog($share,"ignored: $pr");
 			}
 		}
 	}
@@ -376,7 +385,7 @@
 		my $pf = norm_dir($d,"smb:$share/");	# path full
 		my $D = $smb->opendir($pf);
 		if (! $D) {
-			xlog($share,"FATAL: $share [$pf]: $!");
+			xlog($share,"FATAL: $share [$pf] as $param{username}/$param{workgroup}: $!",0);
 			# remove failing dir
 			delete $smb_dirs[$di];
 			return 0;			# failed
@@ -399,10 +408,10 @@
 				} elsif ($item->[0] == main::SMBC_DIR) {
 					push @smb_dirs,$pr;
 				} else {
-					print STDERR "not file or directory [",$item->[0],"]: $pf\n";
+					xlog($share,"not file or directory [".$item->[0]."]: $pf",0);
 				}
 			} else {
-				print STDERR "smb ignored: $pr\n";
+				xlog($share,"smb ignored: $pr");
 			}
 		}
 	}
@@ -584,10 +593,34 @@
 
 =head1 SYNOPSIS
 
-./psinib.pl
+./psinib.pl [OPTION]... [mount script]
 
 =head1 DESCRIPTION
 
+Option can be one of more of following:
+
+=over 8
+
+=item C<--backupdest=dir>
+
+Specify backup destination directory (defaults is /data/
+
+=item C<--noping>
+
+Don't use ping to check if host is up (default is ti use tcp syn to cifs
+port)
+
+=item C<--verbose -v>
+
+Increase verbosity level. Defailt is 1 which prints moderate amount of data
+on STDOUT and STDERR.
+
+=item C<--quiet -q>
+
+Decrease verbosity level
+
+=back
+
 This script in current version support just backup of Samba (or Micro$oft
 Winblowz) shares to central disk space. Central disk space is organized in
 multiple directories named after:
@@ -716,7 +749,7 @@
 
 Dobrica Pavlinusic <dpavlin@rot13.org>
 
-L<http://www.rot13.org/~dpavlin/>
+L<http:E<sol>E<sol>www.rot13.orgE<sol>~dpavlinE<sol>>
 
 =head1 LICENSE