ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bode...@apache.org
Subject cvs commit: jakarta-ant/src/main/org/apache/tools/ant/taskdefs FixCRLF.java
Date Tue, 04 Jun 2002 14:51:54 GMT
bodewig     2002/06/04 07:51:54

  Modified:    src/etc/testcases/taskdefs/fixcrlf/expected Tag:
                        ANT_15_BRANCH Mac2Unix
               src/etc/testcases/taskdefs/fixcrlf/input Tag: ANT_15_BRANCH
                        Mac2Unix
               src/main/org/apache/tools/ant/taskdefs Tag: ANT_15_BRANCH
                        FixCRLF.java
  Log:
  <fixcrlf> wasn't doing the right thing when two carriage returned were
  immediately followed by something else than a linefeed.
  
  Added testcase that fails for the old code and passes now.
  
  Reported by:	Ed Mack
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.1   +2 -0      jakarta-ant/src/etc/testcases/taskdefs/fixcrlf/expected/Mac2Unix
  
  Index: Mac2Unix
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/etc/testcases/taskdefs/fixcrlf/expected/Mac2Unix,v
  retrieving revision 1.1
  retrieving revision 1.1.2.1
  diff -u -r1.1 -r1.1.2.1
  --- Mac2Unix	10 Jan 2002 16:17:12 -0000	1.1
  +++ Mac2Unix	4 Jun 2002 14:51:54 -0000	1.1.2.1
  @@ -1,2 +1,4 @@
   line1
   line2
  +
  +line3
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.1   +1 -1      jakarta-ant/src/etc/testcases/taskdefs/fixcrlf/input/Mac2Unix
  
  Index: Mac2Unix
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/etc/testcases/taskdefs/fixcrlf/input/Mac2Unix,v
  retrieving revision 1.1
  retrieving revision 1.1.2.1
  diff -u -r1.1 -r1.1.2.1
  --- Mac2Unix	10 Jan 2002 16:17:12 -0000	1.1
  +++ Mac2Unix	4 Jun 2002 14:51:54 -0000	1.1.2.1
  @@ -1 +1 @@
  -line1
line2
  \ No newline at end of file
  +line1
line2

line3
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.37.2.1  +3 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/FixCRLF.java
  
  Index: FixCRLF.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/FixCRLF.java,v
  retrieving revision 1.37
  retrieving revision 1.37.2.1
  diff -u -r1.37 -r1.37.2.1
  --- FixCRLF.java	16 Apr 2002 10:36:25 -0000	1.37
  +++ FixCRLF.java	4 Jun 2002 14:51:54 -0000	1.37.2.1
  @@ -116,7 +116,7 @@
    *
    * @author Sam Ruby <a href="mailto:rubys@us.ibm.com">rubys@us.ibm.com</a>
    * @author <a href="mailto:pbwest@powerup.com.au">Peter B. West</a>
  - * @version $Revision: 1.37 $ $Name:  $
  + * @version $Revision: 1.37.2.1 $ $Name:  $
    * @since Ant 1.1
    *
    * @ant.task category="filesystem"
  @@ -852,6 +852,8 @@
                           if ((char) (ch = reader.read()) == '\n') {
                               eolcount += 2;
                               eolStr.append("\r\n");
  +                        } else {
  +                            reader.reset();
                           }
                           break;
                       case '\n':
  
  
  

--
To unsubscribe, e-mail:   <mailto:ant-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:ant-dev-help@jakarta.apache.org>


Mime
View raw message