X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=git-daemon%2Fread-urlmap;h=696ee654a33085f5beec817f9f57eb0ebd89cf34;hb=HEAD;hp=6ae3237bdbb957b012e8e9a2172d999665c0054f;hpb=d36c5f7baf4f11c7d6765afac2f5fb9449b0e0a7;p=userv-utils.git

diff --git a/git-daemon/read-urlmap b/git-daemon/read-urlmap
index 6ae3237..696ee65 100644
--- a/git-daemon/read-urlmap
+++ b/git-daemon/read-urlmap
@@ -18,51 +18,74 @@
 #     $repo_regexp
 #     $require_exportok
 
-die "no config" unless @ARGV;
-
 sub remain_path ($) {
     # return value matches {( / [^/]+ )+}x
-    my ($p) = @_;
-    return "/$specpath" if !defined $p;
-    return "" if $p eq $specpath;
-    return substr($specpath,length($p))
-	if substr($specpath,0,length($p)+1) eq "$p/";
+    my ($vsubpath) = @_;
+    syslog 'debug', sprintf "DEBUG remain_path %s $specpath",
+                              (defined $vsubpath ? $vsubpath : '<undef>');
+    return "/$specpath" if !defined $vsubpath;
+    return "" if $vsubpath eq $specpath;
+    return substr($specpath,length($vsubpath))
+	if substr($specpath,0,length($vsubpath)+1) eq "$vsubpath/";
     return undef;
 }
 
-die unless length $specpath;
+fail "no config ??" unless @ARGV;
+fail "no specpath ??" unless length $specpath;
 
 our $uri = "git://$spechost/$specpath";
-our $repo_regexp= '^/*(\\w[-+._0-9A-Za-z]*)$';
+
+our $repo_regexp= '^(\\w[-+._0-9A-Za-z]*/?\.git)$';  # stupid emacs ';
 our $check_export= 0;
 
+our ($serve_user, $serve_dir, $serve_repo);
+
+sub fexists ($) {
+    my ($f) = @_;
+    if (stat $f) {
+	-f _ or fail "bad config $_ - not a file";
+	return 1;
+    } else {
+	$!==&ENOENT or fail "bad config $_ - could not stat: $!";
+	return 0;
+    }
+}
+
+@ARGV = grep { fexists($_) } @ARGV;
+
 while (<>) {
+
     s/^\s*//;
     s/\s+$//;
     next unless m/\S/;
     next if m/^\#/;
 
     if (m{^ single-user \s+ (\S+?) (/\S*)? \s+ (\S+) (?: \s+ (\S+) )? $ }x) {
-	my ($h,$p,$u,$d) = ($1,$2,$3,$4);
-	next unless $h ne $host;
-	$serve_repo= remain_path($p);
+	my ($h,$v,$u,$d) = ($1,$2,$3,$4);
+	next unless $h eq $spechost;
+	$serve_repo= remain_path($v);
 	next unless defined $serve_repo;
 	$serve_user= $u;
 	$serve_dir= $d;
+        syslog 'debug', "DEBUG $ARGV:$. match".
+            " $serve_user $serve_dir $serve_repo";
     } elsif (m{^ multi-user \s+ (\S+?) (/\S*)? \s+ (\S+) $ }x) {
-	my ($h,$p,$d) = ($1,$2,$3);
-	next unless $1 ne $host;
-	$serve_repo= remain_path($p);
-	next unless defined $serv_repo;
-	next unless $serve_repo =~ s{ ^/\~( [a-z][-+_0-9a-z] )/$ }{ / }xi;
-	$serve_user= $u;
+	my ($h,$v,$d) = ($1,$2,$3);
+	next unless $1 eq $spechost;
+	$serve_repo= remain_path($v);
+	next unless defined $serve_repo;
+        syslog 'debug', "DEBUG $ARGV:$. perhaps $serve_repo";
+	next unless $serve_repo =~ s{ ^/\~( [a-z][-+_0-9a-z]* )/ }{/}xi;
+	$serve_user= $1;
 	$serve_dir= $d;
+        syslog 'debug', "DEBUG $ARGV:$. match".
+            " $serve_user $serve_dir $serve_repo";
     } elsif (m{^ repo-regexp \s+ (\S.*) $ }x) {
 	$repo_regexp= $1;
     } elsif (m{^ (no-)?require-git-daemon-export-ok $ }x) {
 	$check_export= !defined $1;
     } else {
-	die "bad config";
+	fail "config syntax error at $ARGV:$.";
     }
 }