cvs commit: jakarta-ant/src/bin runant.pl

[bodewig]

bodewig     00/10/06 05:49:09

  Modified:    src/bin  runant.pl
  Log:
  Make the system call a little bit more secure.
  
  Submitted by: Olivier Louchart-Fletcher <[EMAIL PROTECTED]>
  
  Revision  Changes    Path
  1.2       +9 -8      jakarta-ant/src/bin/runant.pl
  
  Index: runant.pl
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/bin/runant.pl,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- runant.pl 2000/09/06 11:18:52     1.1
  +++ runant.pl 2000/10/06 12:49:08     1.2
  @@ -102,20 +102,21 @@
        }
   
   #jikes
  -my $ANT_OPTS=$ENV{ANT_OPTS};
  +my @ANT_OPTS=split $ENV{ANT_OPTS};
   if($ENV{JIKESPATH} ne "")
        {
  -     $ANT_OPTS.=" -Djikes.class.path=$ENV{JIKESPATH}";
  +     push @ANT_OPTS, "-Djikes.class.path=$ENV{JIKESPATH}";
        }
   
   #construct arguments to java
   
  -my $METHOD = "org.apache.tools.ant.Main";
  -my $ARGS = "@ARGV";
  -my $JAVAPARAMS = "-classpath $localpath -Dant.home=$HOME ";
  -my $COMMAND = "$JAVACMD $JAVAPARAMS $ANT_OPTS $METHOD $ARGS" ;
  +my @ARGS;
  +push @ARGS, "-classpath", "$localpath", "-Dant.home=$HOME";
  +push @ARGS, @ANT_OPTS;
  +push @ARGS, "org.apache.tools.ant.Main";
  +push @ARGS, @ARGV;
   
  -print "\n $COMMAND\n\n" if ($debug);
  -system $COMMAND;
  +print "\n $JAVACMD @ARGS\n\n" if ($debug);
  +system $JAVACMD, @ARGS;