sub changesopts () { return @changesopts[1..$#changesopts]; }
our $us = 'dgit';
-our $debugprefix = ' ';
+our $debugprefix = '';
sub printdebug { print DEBUG $debugprefix, @_ or die $!; }
my $d;
my $got = read PF, $d, 65536;
die "$ourfn: $!" unless defined $got;
- last if $got;
+ last if !$got;
print $fh "data-block ".length($d)."\n" or die $!;
print $d or die $!;
}
+ PF->eof or die "$ourfn $!";
+ PF->error and die "$ourfn $!";
print $fh "data-end\n" or die $!;
close PF;
}
sub protocol_read_bytes ($$) {
my ($fh, $nbytes) = @_;
- $nbytes =~ m/^\d{1,6}$/ or badproto \*RO, "bad byte count";
+ $nbytes =~ m/^[1-9]\d{0,5}$/ or badproto \*RO, "bad byte count";
my $d;
my $got = read $fh, $d, $nbytes;
$got==$nbytes or badproto $fh, "eof during data block";
open PF, ">", $ourfn or die "$ourfn: $!";
for (;;) {
my ($y,$l) = protocol_expect {
- m/^data-block (.*})$|data-end$/;
- length $1 ? (1,$1) : (0);
+ m/^data-block (.*)$/ ? (1,$1) :
+ m/^data-end$/ ? (0,) :
+ ();
} $fh;
last unless $y;
- my $d = protocol_read_bytes $fh, $1;
+ my $d = protocol_read_bytes $fh, $l;
print PF $d or die $!;
}
- printdebug "received into $ourfn\n";
+ close PF or die $!;
+ printdebug "() $ourfn\n";
}
#---------- remote protocol support, responder ----------
@ARGV = @ARGV[$nrargs..$#ARGV];
die unless @rargs;
my ($dir) = @rargs;
+ $debugprefix = ' ';
changedir $dir;
$we_are_responder = 1;
- $debugprefix = ' ';
autoflush STDOUT 1;
responder_send_command("dgit-remote-push-ready");
&cmd_push;