amanda-plugin-dumpext: comparison bin/amdumpext

equal deleted inserted replaced

-:69a0459ed8b1
+:d176b9443312
 'index=s'     => \$opt_index,        # --index line
 'record!'     => \$opt_record,       # --record
 'level=i@'    => \@opt_level,        # --level n
 'dumpdates=s' => \$opt_dumpdates,    # --dumpdates <file>
 'host=s'      => sub { },            # ignore
-	'disk=s'      => sub { },	     # ignore
+'disk=s'      => sub { },            # ignore
 ) or pod2usage;
 given ($command) {
 when ("support") { exec_support }
 when ("selfcheck") {
 # must: $opt_device
 # may: $opt_level
 OK "$ME version $VERSION";
 OK "euid=$> (" . getpwuid($>) . ')';
 OK "egid=" . do {
-	my $gid = (split ' ', $))[0];
+my $gid = (split ' ', $))[0];
-	my $group = getgrgid $gid;
+my $group = getgrgid $gid;
-	"$gid ($group)";
+"$gid ($group)";
 };
 OK "groups=" . do {
-	my (undef, @gids) = split ' ', $);
+my (undef, @gids) = split ' ', $);
-	my @groups = map { '' . getgrgid $_ } @gids;
+my @groups = map { '' . getgrgid $_ } @gids;
-	"@gids (@groups)";
+"@gids (@groups)";
 };
 foreach my $tool (qw(dump restore)) {
 if ($_ = (grep { -x ($_ .= "/$tool") } split /:/ => $ENV{PATH})[0]) {
 chomp(my $version = (`$_ 2>&1`)[0]);
 OK "$tool is $version";
 }
 else {
 ERROR "$tool not found in $ENV{PATH}";
 }
 }
 # check the device
 # the opt_disk is just a label, the device is in opt_device!
 my $device = device($opt_device);
 my (@errors, @results);
 foreach my $level (@opt_level) {
 my @cmd = (
 dump => "-$level",
-'-S',   # estimate
+'-S',    # estimate
 $opt_record && $opt_dumpdates ? (-D => expand($opt_dumpdates)) : (),
 device($opt_device),
 );
 my @output = `@cmd 2>&1`;
 # fd3: message channel
 # fd4: index channel
 my @dump = (
 dump => "-$opt_level[0]",
-	#'-v', # verbose
--f   => '-',
+#'-v', # verbose
+-f => '-',
 $opt_record ? '-u' : (),
 $opt_record && $opt_dumpdates ? (-D => expand($opt_dumpdates)) : (),
 device($opt_device)
 );
 open(my $idx, '>&=', FD4) or die "Can't open fd4: $!\n" if $opt_index;
 if ($opt_index) {
 my $pid = fork // die "Can't fork: $!\n";
 if (not $pid) {
-	    $0 = "$ME [about to exec dump]";
+$0 = "$ME [about to exec dump]";
-	    # dump will be execed soon, first we've to establish
+# dump will be execed soon, first we've to establish
-	    # the channels - one for STDOUT, and one for STDIN
+# the channels - one for STDOUT, and one for STDIN
 open(STDOUT, '|-') or do {
-		# this is the child that will read
-		# the STDOUT from dump
+# this is the child that will read
-		$0 = "$ME [stdout < dump]";
+# the STDOUT from dump
+$0 = "$ME [stdout < dump]";
 my $pid = open(my $restore, '|-') or do {
-		    $0 = "$ME [toc]";
+$0 = "$ME [toc]";
 open(STDOUT, '|-') or do {
 postprocess_toc($idx);
 exit 0;
 };
 exec 'restore', -tvf => '-';
 die "Can't exec `restore -tvf -`: $!";
 };
-		# the restore may close it's input, we'll get
+# the restore may close it's input, we'll get
-		# a SIG{PIPE} because of this
+# a SIG{PIPE} because of this
-		local $SIG{PIPE} = sub {
+local $SIG{PIPE} = sub {
-		    close $restore;
+close $restore;
-		    $restore = undef;
+$restore = undef;
-		    $SIG{PIPE} = 'default';
+$SIG{PIPE} = 'default';
-		};
+};
 local $/ = \(my $x = 64 * 1024);
 while (<STDIN>) {
 print $_;
 print $restore $_ if $restore;
 }
-		close($restore) if $restore;
+close($restore) if $restore;
 exit 0;
 };
 open(STDERR, '|-') or do {
-		$0 = "$ME [stderr < dump]";
+$0 = "$ME [stderr < dump]";
 postprocess_dump_messages($msg);
 exit 0;
 };
-	     # we need to fork again, otherwise dump sees
+# we need to fork again, otherwise dump sees
-	     # the end of the above children and complains
+# the end of the above children and complains
-	     my $pid = fork // die "Can't fork: $!\n";
+my $pid = fork // die "Can't fork: $!\n";
-	     if (not $pid) {
+if (not $pid) {
-		exec @dump;
+exec @dump;
-		die "Can't exec `@dump': $!\n";
+die "Can't exec `@dump': $!\n";
-	    }
+}
-	    waitpid($pid, 0);
+waitpid($pid, 0);
 }
 waitpid($pid, 0);
 exit $?;
 }
 }
 sub postprocess_dump_messages {
-select +shift;  # send output to the message channel
+select +shift;    # send output to the message channel
 while (<STDIN>) {
 print "| $_";
 if (/^\s+DUMP: (\d+) blocks?/) {
 # we assume a block size of 1K
 say "sendbackup: size $1";
 }
 elsif (/^\s+DUMP: DUMP IS DONE/) {
 say 'sendbackup: end';
 # restore to use a \0 separated output format
 select +shift;
 die 'IFS is not as expected!' if $/ ne "\n";
 my $buffer = undef;
 my $type   = undef;
 while (1) {
 # skip the header lines
 if (1 .. defined && /\Adir\s+\d+\s+(.*)\Z/) {
 $buffer = '';
 $type   = 'dir';
-	    die "Unexpected end of input while reading from restore -tvf\n" if not defined;
+die "Unexpected end of input while reading from restore -tvf\n"
+if not defined;
 next;
 }
 # if we match really good the buffer may be output
 if (not defined

changeset 9	d176b9443312
parent 8	69a0459ed8b1
child 10	8231f7b00052