undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Git.pm: allow pipes to be closed prior to calling command_close_bidi_pipe

Browse Source 
The command_close_bidi_pipe() function will insist on closing both
input and output pipes returned by command_bidi_pipe().  With this
change it is possible to close one of the pipes in advance and pass
undef as an argument.

Signed-off-by: Michal Nazarewicz <mina86@mina86.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Michal Nazarewicz 2013-02-12 15:02:31 +01:00 committed by Junio C Hamano
parent 1323dba6af
commit f4c0035de6
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
perl/Git.pm
View File

@ -426,12 +426,25 @@ Note that you should not rely on whatever actually is in C<CTX>;
currently it is simply the command name but in future the context might currently it is simply the command name but in future the context might
have more complicated structure. have more complicated structure.
C<PIPE_IN> and C<PIPE_OUT> may be C<undef> if they have been closed prior to
calling this function. This may be useful in a query-response type of
commands where caller first writes a query and later reads response, eg:
my ($pid, $in, $out, $ctx) = $r->command_bidi_pipe('cat-file --batch-check');
print $out "000000000\n";
close $out;
while (<$in>) { ... }
$r->command_close_bidi_pipe($pid, $in, undef, $ctx);
This idiom may prevent potential dead locks caused by data sent to the output
pipe not being flushed and thus not reaching the executed command.
=cut =cut
sub command_close_bidi_pipe { sub command_close_bidi_pipe {
local $?; local $?;
my ($self, $pid, $in, $out, $ctx) = _maybe_self(@_); my ($self, $pid, $in, $out, $ctx) = _maybe_self(@_);
_cmd_close($ctx, $in, $out); _cmd_close($ctx, (grep { defined } ($in, $out)));
waitpid $pid, 0; waitpid $pid, 0;
if ($? >> 8) { if ($? >> 8) {
throw Git::Error::Command($ctx, $? >>8); throw Git::Error::Command($ctx, $? >>8);