summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSylvain Rabot <sylvain@abstraction.fr>2010-12-30 21:20:29 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-01-04 23:59:26 (GMT)
commit3ca7353cab4ed6c7efac0c8d7477c87112fc7350 (patch)
tree041beeda2bf2fff1c8674c68265fd63b142d827c
parent3ce19eb857c46727239eda3b3dd265d725ea8ddd (diff)
downloadgit-3ca7353cab4ed6c7efac0c8d7477c87112fc7350.zip
git-3ca7353cab4ed6c7efac0c8d7477c87112fc7350.tar.gz
git-3ca7353cab4ed6c7efac0c8d7477c87112fc7350.tar.bz2
gitweb: remove unnecessary test when closing file descriptor
It happens that closing file descriptor fails whereas the blob is perfectly readable. According to perlman the reasons could be: If the file handle came from a piped open, "close" will additionally return false if one of the other system calls involved fails, or if the program exits with non-zero status. (If the only problem was that the program exited non-zero, $! will be set to 0.) Closing a pipe also waits for the process executing on the pipe to complete, in case you want to look at the output of the pipe afterwards, and implicitly puts the exit status value of that command into $?. Prematurely closing the read end of a pipe (i.e. before the process writ- ing to it at the other end has closed it) will result in a SIGPIPE being delivered to the writer. If the other end can't handle that, be sure to read all the data before closing the pipe. In this case we don't mind that close fails. Signed-off-by: Sylvain Rabot <sylvain@abstraction.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rwxr-xr-xgitweb/gitweb.perl3
1 files changed, 1 insertions, 2 deletions
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index 84f2c1d..4e3bf4a 100755
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@ -3465,8 +3465,7 @@ sub run_highlighter {
my ($fd, $highlight, $syntax) = @_;
return $fd unless ($highlight && defined $syntax);
- close $fd
- or die_error(404, "Reading blob failed");
+ close $fd;
open $fd, quote_command(git_cmd(), "cat-file", "blob", $hash)." | ".
quote_command($highlight_bin).
" --xhtml --fragment --syntax $syntax |"