You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@ant.apache.org by co...@apache.org on 2003/01/17 03:14:39 UTC

cvs commit: jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/pvcs Pvcs.java

conor       2003/01/16 18:14:39

  Modified:    src/main/org/apache/tools/ant/taskdefs/optional/pvcs
                        Pvcs.java
  Log:
  Fix up PVCS folder creation
  
  PR:	3219
  Submitted by:	Shane Hartman
  
  Revision  Changes    Path
  1.20      +20 -15    jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/pvcs/Pvcs.java
  
  Index: Pvcs.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/pvcs/Pvcs.java,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -w -u -r1.19 -r1.20
  --- Pvcs.java	31 Oct 2002 15:12:53 -0000	1.19
  +++ Pvcs.java	17 Jan 2003 02:14:39 -0000	1.20
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2001-2002 The Apache Software Foundation.  All rights
  + * Copyright (c) 2001-2003 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  @@ -315,7 +315,11 @@
                   log("Considering \"" + line + "\"", Project.MSG_VERBOSE);
                   if (line.startsWith("\"\\") ||
                       line.startsWith("\"/") ||
  -                    line.startsWith(getLineStart())) {
  +                    (line.length() >3 &&
  +                     line.startsWith("\"") &&
  +                     Character.isLetter(line.charAt(1)) &&
  +                     String.valueOf(line.charAt(2)).equals(":") &&
  +                     String.valueOf(line.charAt(3)).equals("\\"))) {
                       Object[] objs = mf.parse(line);
                       String f = (String) objs[1];
                       // Extract the name of the directory from the filename
  @@ -636,3 +640,4 @@
           filenameFormat = "{0}-arc({1})";
       }
   }
  +
  
  
  

--
To unsubscribe, e-mail:   <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>