[Templates-cvs] cvs commit: Template2/bin ttree

cvs         06/01/30 14:31:39

  Modified:    bin      ttree
  Log:
  * applied patch to fix infinite loop with directory called "0"
  
  Revision  Changes    Path
  2.81      +4 -4      Template2/bin/ttree
  
  Index: ttree
  ===================================================================
  RCS file: /template-toolkit/Template2/bin/ttree,v
  retrieving revision 2.80
  retrieving revision 2.81
  diff -u -r2.80 -r2.81
  --- ttree	2006/01/30 14:06:30	2.80
  +++ ttree	2006/01/30 14:31:38	2.81
  @@ -23,7 +23,7 @@
   #
   #------------------------------------------------------------------------
   #
  -# $Id: ttree,v 2.80 2006/01/30 14:06:30 abw Exp $
  +# $Id: ttree,v 2.81 2006/01/30 14:31:38 abw Exp $
   #
   #========================================================================
   
  @@ -37,7 +37,7 @@
   use Text::ParseWords qw(quotewords);
   
   my $NAME     = "ttree";
  -my $VERSION  = sprintf("%d.%02d", q$Revision: 2.80 $ =~ /(\d+)\.(\d+)/);
  +my $VERSION  = sprintf("%d.%02d", q$Revision: 2.81 $ =~ /(\d+)\.(\d+)/);
   my $HOME     = $ENV{ HOME } || '';
   my $RCFILE   = $ENV{"\U${NAME}rc"} || "$HOME/.${NAME}rc";
   my $TTMODULE = 'Template';
  @@ -231,14 +231,14 @@
       my $target;
       local *DIR;
   
  -    my $absdir = join('/', $srcdir ? $srcdir : (), $dir ? $dir : ());
  +    my $absdir = join('/', $srcdir ? $srcdir : (), defined $dir ? $dir : ());
       $absdir ||= '.';
   
       opendir(DIR, $absdir) || do { warn "$absdir: $!\n"; return undef; };
   
       FILE: while (defined ($file = readdir(DIR))) {
           next if $file eq '.' || $file eq '..';
  -        $path = $dir ? "$dir/$file" : $file;
  +        $path = defined $dir ? "$dir/$file" : $file;
           $abspath = "$absdir/$file";
           
           next unless -e $abspath;