From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 3 Apr 2013 15:35:45 +0000 (-0700)
Subject: Merge branch 'jc/perl-cat-blob' into maint-1.8.1
X-Git-Tag: v1.8.1.6~11
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/a134a60d0b6a5aaf92b3cfa04279698fdf359e5e?ds=inline;hp=-c

Merge branch 'jc/perl-cat-blob' into maint-1.8.1

* jc/perl-cat-blob:
Git.pm: fix cat_blob crashes on large files
---

a134a60d0b6a5aaf92b3cfa04279698fdf359e5e
diff --combined perl/Git.pm
index a56d1e76f7,cebf8f34c2..57a17160f9
--- a/perl/Git.pm
+++ b/perl/Git.pm
@@@ -58,8 -58,7 +58,8 @@@ require Exporter
                  command_output_pipe command_input_pipe command_close_pipe
                  command_bidi_pipe command_close_bidi_pipe
                  version exec_path html_path hash_object git_cmd_try
 -                remote_refs
 +                remote_refs prompt
 +                get_tz_offset
                  temp_acquire temp_release temp_reset temp_path);
  
  
@@@ -103,7 -102,6 +103,7 @@@ use Error qw(:try)
  use Cwd qw(abs_path cwd);
  use IPC::Open2 qw(open2);
  use Fcntl qw(SEEK_SET SEEK_CUR);
 +use Time::Local qw(timegm);
  }
  
  
@@@ -514,79 -512,6 +514,79 @@@ C<git --html-path>). Useful mostly onl
  sub html_path { command_oneline('--html-path') }
  
  
 +=item get_tz_offset ( TIME )
 +
 +Return the time zone offset from GMT in the form +/-HHMM where HH is
 +the number of hours from GMT and MM is the number of minutes.  This is
 +the equivalent of what strftime("%z", ...) would provide on a GNU
 +platform.
 +
 +If TIME is not supplied, the current local time is used.
 +
 +=cut
 +
 +sub get_tz_offset {
 +	# some systmes don't handle or mishandle %z, so be creative.
 +	my $t = shift || time;
 +	my $gm = timegm(localtime($t));
 +	my $sign = qw( + + - )[ $gm <=> $t ];
 +	return sprintf("%s%02d%02d", $sign, (gmtime(abs($t - $gm)))[2,1]);
 +}
 +
 +
 +=item prompt ( PROMPT , ISPASSWORD  )
 +
 +Query user C<PROMPT> and return answer from user.
 +
 +Honours GIT_ASKPASS and SSH_ASKPASS environment variables for querying
 +the user. If no *_ASKPASS variable is set or an error occoured,
 +the terminal is tried as a fallback.
 +If C<ISPASSWORD> is set and true, the terminal disables echo.
 +
 +=cut
 +
 +sub prompt {
 +	my ($prompt, $isPassword) = @_;
 +	my $ret;
 +	if (exists $ENV{'GIT_ASKPASS'}) {
 +		$ret = _prompt($ENV{'GIT_ASKPASS'}, $prompt);
 +	}
 +	if (!defined $ret && exists $ENV{'SSH_ASKPASS'}) {
 +		$ret = _prompt($ENV{'SSH_ASKPASS'}, $prompt);
 +	}
 +	if (!defined $ret) {
 +		print STDERR $prompt;
 +		STDERR->flush;
 +		if (defined $isPassword && $isPassword) {
 +			require Term::ReadKey;
 +			Term::ReadKey::ReadMode('noecho');
 +			$ret = '';
 +			while (defined(my $key = Term::ReadKey::ReadKey(0))) {
 +				last if $key =~ /[\012\015]/; # \n\r
 +				$ret .= $key;
 +			}
 +			Term::ReadKey::ReadMode('restore');
 +			print STDERR "\n";
 +			STDERR->flush;
 +		} else {
 +			chomp($ret = <STDIN>);
 +		}
 +	}
 +	return $ret;
 +}
 +
 +sub _prompt {
 +	my ($askpass, $prompt) = @_;
 +	return unless length $askpass;
 +	$prompt =~ s/\n/ /g;
 +	my $ret;
 +	open my $fh, "-|", $askpass, $prompt or return;
 +	$ret = <$fh>;
 +	$ret =~ s/[\015\012]//g; # strip \r\n, chomp does not work on all systems (i.e. windows) as expected
 +	close ($fh);
 +	return $ret;
 +}
 +
  =item repo_path ()
  
  Return path to the git repository. Must be called on a repository instance.
@@@ -965,20 -890,22 +965,22 @@@ sub cat_blob 
  	my $size = $1;
  
  	my $blob;
- 	my $bytesRead = 0;
+ 	my $bytesLeft = $size;
  
  	while (1) {
- 		my $bytesLeft = $size - $bytesRead;
  		last unless $bytesLeft;
  
  		my $bytesToRead = $bytesLeft < 1024 ? $bytesLeft : 1024;
- 		my $read = read($in, $blob, $bytesToRead, $bytesRead);
+ 		my $read = read($in, $blob, $bytesToRead);
  		unless (defined($read)) {
  			$self->_close_cat_blob();
  			throw Error::Simple("in pipe went bad");
  		}
- 
- 		$bytesRead += $read;
+ 		unless (print $fh $blob) {
+ 			$self->_close_cat_blob();
+ 			throw Error::Simple("couldn't write to passed in filehandle");
+ 		}
+ 		$bytesLeft -= $read;
  	}
  
  	# Skip past the trailing newline.
@@@ -993,11 -920,6 +995,6 @@@
  		throw Error::Simple("didn't find newline after blob");
  	}
  
- 	unless (print $fh $blob) {
- 		$self->_close_cat_blob();
- 		throw Error::Simple("couldn't write to passed in filehandle");
- 	}
- 
  	return $size;
  }