Merge branch 'pm/cvs-environ'

* pm/cvs-environ:
CVS Server: Support reading base and roots from environment

diff --combined git-cvsserver.perl
index 15da2789e011f76c848f4e453cdf41837d4a75f7,f5b57b9cbe70f5fc231c26b7d51512ef32b82925..28041060c8a36ac2b89ee179501c2ec726f4606b
--- 1/git-cvsserver.perl
--- 2/git-cvsserver.perl
+++ b/git-cvsserver.perl
@@@ -104,6 -104,7 +104,7 @@@ $log->info("--------------- STARTING --
  my $usage =
      "Usage: git cvsserver [options] [pserver|server] [<directory> ...]\n".
      "    --base-path <path>  : Prepend to requested CVSROOT\n".
+     "                          Can be read from GIT_CVSSERVER_BASE_PATH\n".
      "    --strict-paths      : Don't allow recursing into subdirectories\n".
      "    --export-all        : Don't check for gitcvs.enabled in config\n".
      "    --version, -V       : Print version information and exit\n".
@@@ -111,7 -112,8 +112,8 @@@
      "\n".
      "<directory> ... is a list of allowed directories. If no directories\n".
      "are given, all are allowed. This is an additional restriction, gitcvs\n".
-     "access still needs to be enabled by the gitcvs.enabled config option.\n";
+     "access still needs to be enabled by the gitcvs.enabled config option.\n".
+     "Alternately, one directory may be specified in GIT_CVSSERVER_ROOT.\n";
  
  my @opts = ( 'help|h|H', 'version|V',
             'base-path=s', 'strict-paths', 'export-all' );
@@@ -148,6 -150,24 +150,24 @@@ if ($state->{'export-all'} && !@{$state
      die "--export-all can only be used together with an explicit whitelist\n";
  }
  
+ # Environment handling for running under git-shell
+ if (exists $ENV{GIT_CVSSERVER_BASE_PATH}) {
+     if ($state->{'base-path'}) {
+       die "Cannot specify base path both ways.\n";
+     }
+     my $base_path = $ENV{GIT_CVSSERVER_BASE_PATH};
+     $state->{'base-path'} = $base_path;
+     $log->debug("Picked up base path '$base_path' from environment.\n");
+ }
+ if (exists $ENV{GIT_CVSSERVER_ROOT}) {
+     if (@{$state->{allowed_roots}}) {
+       die "Cannot specify roots both ways: @ARGV\n";
+     }
+     my $allowed_root = $ENV{GIT_CVSSERVER_ROOT};
+     $state->{allowed_roots} = [ $allowed_root ];
+     $log->debug("Picked up allowed root '$allowed_root' from environment.\n");
+ }
+ 
  # if we are called with a pserver argument,
  # deal with the authentication cat before entering the
  # main loop
@@@ -981,8 -1001,6 +1001,8 @@@ sub req_updat
  
      #$log->debug("update state : " . Dumper($state));
  
 +    my $last_dirname = "///";
 +
      # foreach file specified on the command line ...
      foreach my $filename ( @{$state->{args}} )
      {
@@@ -990,20 -1008,6 +1010,20 @@@
  
          $log->debug("Processing file $filename");
  
 +        unless ( $state->{globaloptions}{-Q} || $state->{globaloptions}{-q} )
 +        {
 +            my $cur_dirname = dirname($filename);
 +            if ( $cur_dirname ne $last_dirname )
 +            {
 +                $last_dirname = $cur_dirname;
 +                if ( $cur_dirname eq "" )
 +                {
 +                    $cur_dirname = ".";
 +                }
 +                print "E cvs update: Updating $cur_dirname\n";
 +            }
 +        }
 +
          # if we have a -C we should pretend we never saw modified stuff
          if ( exists ( $state->{opt}{C} ) )
          {