git-daemon: suppress warnings

[userv-utils.git] / git-daemon / git-daemon.pl

diff --git a/git-daemon/git-daemon.pl b/git-daemon/git-daemon.pl
index df753e1f79ac67eb5aa884c489673b0346ec424f..5458c08fcd2c77036fcf34261d900640fbbb010e 100755 (executable)
--- a/git-daemon/git-daemon.pl
+++ b/git-daemon/git-daemon.pl
@@ -18,7 +18,7 @@ use Socket;
 use Sys::Syslog;
 
 use vars qw{ %vhost_default_user %vhost_user_from_tilde
-            $TILDE $REPO $HOSTNAME };
+             $TILDE $REPO $HOSTNAME };
 
 use lib '/etc/userv';
 require 'git-daemon-vhosts.pl';
@@ -44,18 +44,14 @@ sub fail {
 sub xread {
     my $length = shift;
     my $buffer = "";
-    my $count = 0;
-    # simply die if the client takes too long
+    local $SIG{ALRM} = sub { fail "timeout" };
     alarm 30;
     while ($length > length $buffer) {
-        my ($data,$ret);
-       do {
-           $ret = sysread STDIN, $data, $length
-       } while not defined $ret and ($! == EINTR or $! == EAGAIN);
-        fail "read: $!" unless defined $ret;
-        fail "short read: expected $length bytes, got $count" if $ret == 0;
-        $buffer .= $data;
-        $count += $ret;
+        my $ret = sysread STDIN, $buffer, $length, length $buffer;
+        fail "short read: expected $length bytes, got " . length $buffer
+                            if defined $ret and $ret == 0;
+        fail "read: $!" if not defined $ret and $! != EINTR and $! != EAGAIN;
+        $ret = 0        if not defined $ret;
     }
     alarm 0;
     return $buffer;
@@ -63,9 +59,7 @@ sub xread {
 
 my $len_hex = xread 4;
 fail "non-hexadecimal packet length" unless $len_hex =~ m{^[0-9a-zA-Z]{4}$};
-my $len = hex $len_hex;
-
-my $line = xread $len;
+my $line = xread hex $len_hex;
 unless ($line =~ m{^git-upload-pack (?:~($TILDE)/)?($REPO[.]git)\0host=($HOSTNAME)\0$}) {
     $line =~ s/[^ -~]+/ /g;
     fail "could not parse \"$line\""
@@ -75,12 +69,12 @@ my $url = $tilde ? "git://$host/~$tilde/$repo" : "git://$host/$repo";
 
 my $user = $vhost_user_from_tilde{$host} ? $tilde : $vhost_default_user{$host};
 fail "no user configuration for $url" unless defined $user;
-
 syslog 'info', "$peer $user $url";
 
-my @opts = ("-DCLIENT=$addr", "-DHOST=$host", "-DREPO=$repo");
+my @opts = ("-DHOST=$host", "-DREPO=$repo");
 push @opts, "-DTILDE=$tilde" if defined $tilde;
-
+push @opts, "-DCLIENT=$addr" if defined $addr;
+no warnings; # suppress errors to stderr
 exec 'userv', @opts, $user, 'git-upload-pack'
     or fail "exec userv: $!";