chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
1a0af54
)
wip, compile fixes
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Wed, 9 Oct 2013 07:47:57 +0000
(08:47 +0100)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Wed, 9 Oct 2013 07:47:57 +0000
(08:47 +0100)
dgit
patch
|
blob
|
history
diff --git
a/dgit
b/dgit
index 6a3f7b7626c97c91150d8ebf329f6bd8b11b850f..08ecca6ffcf3175f856a3029020d09671cec735b 100755
(executable)
--- a/
dgit
+++ b/
dgit
@@
-28,7
+28,6
@@
use File::Basename;
use Dpkg::Version;
use POSIX;
use IPC::Open2;
use Dpkg::Version;
use POSIX;
use IPC::Open2;
-use File::Temp;
our $our_version = 'UNRELEASED'; ###substituted###
our $our_version = 'UNRELEASED'; ###substituted###
@@
-172,8
+171,8
@@
sub badproto ($$) {
fail "protocol violation; $m not expected";
}
fail "protocol violation; $m not expected";
}
-sub protocol_expect (
$&
) {
- my ($
fh, $matc
h) = @_;
+sub protocol_expect (
&$
) {
+ my ($
match, $f
h) = @_;
local $_;
$_ = <$fh>;
defined && chomp or badproto $fh, "eof";
local $_;
$_ = <$fh>;
defined && chomp or badproto $fh, "eof";
@@
-209,7
+208,7
@@
sub protocol_receive_file ($$) {
my ($fh, $ourfn) = @_;
open PF, ">", $ourfn or die "$ourfn: $!";
for (;;) {
my ($fh, $ourfn) = @_;
open PF, ">", $ourfn or die "$ourfn: $!";
for (;;) {
- protocol_expect
\*STDIN, { m/^data-block (.*})$|data-end$/ }
;
+ protocol_expect
{ m/^data-block (.*})$|data-end$/ } \*STDIN
;
length $1 or last;
my $d = protocol_read_bytes \*STDIN, $1;
print PF $d or die $!;
length $1 or last;
my $d = protocol_read_bytes \*STDIN, $1;
print PF $d or die $!;
@@
-240,14
+239,14
@@
sub responder_receive_files ($@) {
foreach my $fn (@ourfns) {
protocol_receive_file \*STDIN, $fn;
}
foreach my $fn (@ourfns) {
protocol_receive_file \*STDIN, $fn;
}
- protocol_expect
\*STDIN, { m/^files-end$/ }
;
+ protocol_expect
{ m/^files-end$/ } \*STDIN
;
}
#---------- remote protocol support, initiator ----------
sub initiator_expect (&) {
my ($match) = @_;
}
#---------- remote protocol support, initiator ----------
sub initiator_expect (&) {
my ($match) = @_;
- protocol_expect
\*RO, &$match
;
+ protocol_expect
{ &$match } \*RO
;
}
#---------- end remote code ----------
}
#---------- end remote code ----------