cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/util/io FileUtil.java

[costin]

costin      01/08/15 17:19:20

  Modified:    src/share/org/apache/tomcat/util/io FileUtil.java
  Log:
  Fix for 2033.
  
  Thanks to [EMAIL PROTECTED] (James Thomas) for the fix
  
  Revision  Changes    Path
  1.6       +10 -4     jakarta-tomcat/src/share/org/apache/tomcat/util/io/FileUtil.java
  
  Index: FileUtil.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/io/FileUtil.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- FileUtil.java     2001/08/11 02:52:45     1.5
  +++ FileUtil.java     2001/08/16 00:19:20     1.6
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/io/FileUtil.java,v 1.5 
2001/08/11 02:52:45 larryi Exp $
  - * $Revision: 1.5 $
  - * $Date: 2001/08/11 02:52:45 $
  + * $Header: 
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/io/FileUtil.java,v 1.6 
2001/08/16 00:19:20 costin Exp $
  + * $Revision: 1.6 $
  + * $Date: 2001/08/16 00:19:20 $
    *
    * ====================================================================
    *
  @@ -380,7 +380,13 @@
        
        while ((ze = zis.getNextEntry()) != null) {
            try {
  -             File f = new File(dir, ze.getName());
  +
  +             // Bug 2033
  +             File f;
  +             if( File.separatorChar == '\\' ) // NT
  +                 f = new File( dir, ze.getName().replace('/','\\') );
  +             else
  +                 f = new File( dir, ze.getName() );
                // create intermediary directories - sometimes zip don't add them
                File dirF=new File(f.getParent());
                dirF.mkdirs();