Marcus Griep <marcus@xxxxxxxx> wrote:
> Perl 5.8.0 ships with File::Temp 0.13, which does not have the new()
> interface introduced in 0.14, as pointed out by Tom G. Christensen.
>
> This modifies Git.pm to use the more established tempfile() interface
> and updates 'git svn' to match.
>
> Signed-off-by: Marcus Griep <marcus@xxxxxxxx>
> ---
>
> This patch v2 cleans up a few code items, corrects a misspelling,
> and ensures that the temp file gets unlinked when we exit, now
> that we are requesting the filename. Otherwise, the previous
> comments stand:
>
> Per the earlier patch versions by Abhijit Menon-Sen and Tom G. Christensen.
> Both of you may want to run a test and add your 'Tested-by' to the thread
> if everything works out before Eric Wong adds his 'Acked-by'.
Thanks Marcus, this works for me.
(Perl 5.10.0, so no compatibility issues).
<bikeshed>
Can we rename temp_fname() to temp_path(), though? "fname"
just doesn't look right in the API to me...
</bikeshed>
> git-svn.perl | 4 ++--
> perl/Git.pm | 42 ++++++++++++++++++++++++++++++------------
> 2 files changed, 32 insertions(+), 14 deletions(-)
>
> diff --git a/git-svn.perl b/git-svn.perl
> index ee3f5ed..c92bd8e 100755
> --- a/git-svn.perl
> +++ b/git-svn.perl
> @@ -3304,7 +3304,7 @@ sub close_file {
> my $out = syswrite($tmp_fh, $str, $res);
> defined($out) && $out == $res
> or croak("write ",
> - $tmp_fh->filename,
> + Git::temp_fname($tmp_fh),
> ": $!\n");
> }
> defined $res or croak $!;
> @@ -3315,7 +3315,7 @@ sub close_file {
> }
>
> $hash = $::_repository->hash_and_insert_object(
> - $fh->filename);
> + Git::temp_fname($fh));
> $hash =~ /^[a-f\d]{40}$/ or die "not a sha1: $hash\n";
>
> Git::temp_release($fb->{base}, 1);
> diff --git a/perl/Git.pm b/perl/Git.pm
> index 102e6a4..3f5514c 100644
> --- a/perl/Git.pm
> +++ b/perl/Git.pm
> @@ -58,7 +58,7 @@ require Exporter;
> command_bidi_pipe command_close_bidi_pipe
> version exec_path hash_object git_cmd_try
> remote_refs
> - temp_acquire temp_release temp_reset);
> + temp_acquire temp_release temp_reset temp_fname);
>
>
> =head1 DESCRIPTION
> @@ -937,7 +937,7 @@ sub _close_cat_blob {
>
> { # %TEMP_* Lexical Context
>
> -my (%TEMP_LOCKS, %TEMP_FILES);
> +my (%TEMP_FILEMAP, %TEMP_FILES);
>
> =item temp_acquire ( NAME )
>
> @@ -965,7 +965,7 @@ sub temp_acquire {
>
> my $temp_fd = _temp_cache($name);
>
> - $TEMP_LOCKS{$temp_fd} = 1;
> + $TEMP_FILES{$temp_fd}{locked} = 1;
> $temp_fd;
> }
>
> @@ -991,16 +991,16 @@ the same string.
> sub temp_release {
> my ($self, $temp_fd, $trunc) = _maybe_self(@_);
>
> - if (ref($temp_fd) ne 'File::Temp') {
> + if (exists $TEMP_FILEMAP{$temp_fd}) {
> $temp_fd = $TEMP_FILES{$temp_fd};
> }
> - unless ($TEMP_LOCKS{$temp_fd}) {
> + unless ($TEMP_FILES{$temp_fd}{locked}) {
> carp "Attempt to release temp file '",
> $temp_fd, "' that has not been locked";
> }
> temp_reset($temp_fd) if $trunc and $temp_fd->opened;
>
> - $TEMP_LOCKS{$temp_fd} = 0;
> + $TEMP_FILES{$temp_fd}{locked} = 0;
> undef;
> }
>
> @@ -1009,9 +1009,9 @@ sub _temp_cache {
>
> _verify_require();
>
> - my $temp_fd = \$TEMP_FILES{$name};
> + my $temp_fd = \$TEMP_FILEMAP{$name};
> if (defined $$temp_fd and $$temp_fd->opened) {
> - if ($TEMP_LOCKS{$$temp_fd}) {
> + if ($TEMP_FILES{$$temp_fd}{locked}) {
> throw Error::Simple("Temp file with moniker '",
> $name, "' already in use");
> }
> @@ -1021,12 +1021,13 @@ sub _temp_cache {
> carp "Temp file '", $name,
> "' was closed. Opening replacement.";
> }
> - $$temp_fd = File::Temp->new(
> - TEMPLATE => 'Git_XXXXXX',
> - DIR => File::Spec->tmpdir
> + my $fname;
> + ($$temp_fd, $fname) = File::Temp->tempfile(
> + 'Git_XXXXXX', UNLINK => 1
> ) or throw Error::Simple("couldn't open new temp file");
> $$temp_fd->autoflush;
> binmode $$temp_fd;
> + $TEMP_FILES{$$temp_fd}{fname} = $fname;
> }
> $$temp_fd;
> }
> @@ -1053,8 +1054,25 @@ sub temp_reset {
> or throw Error::Simple("expected file position to be reset");
> }
>
> +=item temp_fname ( NAME )
> +
> +=item temp_fname ( FILEHANDLE )
> +
> +Returns the filename associated with the given tempfile.
> +
> +=cut
> +
> +sub temp_fname {
> + my ($self, $temp_fd) = _maybe_self(@_);
> +
> + if (exists $TEMP_FILEMAP{$temp_fd}) {
> + $temp_fd = $TEMP_FILEMAP{$temp_fd};
> + }
> + $TEMP_FILES{$temp_fd}{fname};
> +}
> +
> sub END {
> - unlink values %TEMP_FILES if %TEMP_FILES;
> + unlink values %TEMP_FILEMAP if %TEMP_FILEMAP;
> }
>
> } # %TEMP_* Lexical Context
> --
> 1.6.0.1.400.gd2470
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
