Fix symlink handling in git-svn, related to PerlIO
After reading the leading contents from a symlink data obtained from subversion, which we expect to begin with 'link ', the code forked to hash the remainder (which should match readlink() result) using git-hash-objects, by redirecting its STDIN from the filehandle we read that 'link ' from. This was Ok with Perl on modern Linux, but on Mac OS, the read in the parent process slurped more than we asked for in stdio buffer, and the child did not correctly see the "remainder". This attempts to fix the issue by using lower level sysseek and sysread instead of seek and read to bypass the stdio buffer. Signed-off-by: Junio C Hamano <junkio@cox.net> Acked-by: Eric Wong <normalperson@yhbt.net> Acked-by: Seth Falcon <sethfalcon@gmail.com>
Junio C Hamano committed
Apr 29, 2007 at 14:05 UTC
bcd8ee5b4368594f2fe646c97d75a8bcdfb1d4e7
1 file changed
+2
-2
git-svn.perl
+2
-2
@@ -2470,9 +2470,9 @@ sub close_file {
2470
my $got = $md5->hexdigest;
2471
die "Checksum mismatch: $path\n",
2472
"expected: $exp\n got: $got\n" if ($got ne $exp);
2473
- seek($fh, 0, 0) or croak $!;
2473
+ sysseek($fh, 0, 0) or croak $!;
2474
if ($fb->{mode_b} == 120000) {
2475
- read($fh, my $buf, 5) == 5 or croak $!;
2475
+ sysread($fh, my $buf, 5) == 5 or croak $!;
2476
$buf eq 'link ' or die "$path has mode 120000",
2477
"but is not a link\n";
2478
}