From cvs-return-4816-apmail-apr-cvs-archive=apr.apache.org@apr.apache.org Tue Mar 04 22:19:41 2003
Return-Path: <cvs-return-4816-apmail-apr-cvs-archive=apr.apache.org@apr.apache.org>
Delivered-To: apmail-apr-cvs-archive@apr.apache.org
Received: (qmail 63466 invoked by uid 500); 4 Mar 2003 22:19:39 -0000
Mailing-List: contact cvs-help@apr.apache.org; run by ezmlm
Precedence: bulk
List-Post: <mailto:cvs@apr.apache.org>
List-Help: <mailto:cvs-help@apr.apache.org>
List-Unsubscribe: <mailto:cvs-unsubscribe@apr.apache.org>
List-Subscribe: <mailto:cvs-subscribe@apr.apache.org>
Reply-To: dev@apr.apache.org
Delivered-To: mailing list cvs@apr.apache.org
Received: (qmail 63453 invoked from network); 4 Mar 2003 22:19:39 -0000
Date: 4 Mar 2003 22:19:38 -0000
Message-ID: <20030304221938.19275.qmail@icarus.apache.org>
From: wrowe@apache.org
To: apr-cvs@apache.org
Subject: cvs commit: apr/file_io/win32 readwrite.c
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N

wrowe       2003/03/04 14:19:38

  Modified:    .        CHANGES
               file_io/os2 readwrite.c
               file_io/win32 readwrite.c
  Log:
    Correct apr_file_gets() on OS2 and Win32 so that '\r's are no longer
    eaten, and apr_file_gets() -> apr_file_puts() moves the contents
    uncorrupted.
  
  Reviewed by bicholes and brane
  
  Revision  Changes    Path
  1.383     +4 -0      apr/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/apr/CHANGES,v
  retrieving revision 1.382
  retrieving revision 1.383
  diff -u -r1.382 -r1.383
  --- CHANGES	27 Feb 2003 19:13:48 -0000	1.382
  +++ CHANGES	4 Mar 2003 22:19:38 -0000	1.383
  @@ -1,5 +1,9 @@
   Changes with APR 0.9.2
   
  +  *) Correct apr_file_gets() on OS2 and Win32 so that '\r's are no longer
  +     eaten, and apr_file_gets() -> apr_file_puts() moves the contents
  +     uncorrupted.  [William Rowe]
  +
     *) Alter Win32's handling of the apr_proc_t hproc member, so that we
        close that system handle wherever an apr function would invoke the
        final waitpid() against a zombie process on Unix.  [William Rowe]
  
  
  
  1.57      +1 -3      apr/file_io/os2/readwrite.c
  
  Index: readwrite.c
  ===================================================================
  RCS file: /home/cvs/apr/file_io/os2/readwrite.c,v
  retrieving revision 1.56
  retrieving revision 1.57
  diff -u -r1.56 -r1.57
  --- readwrite.c	7 Jan 2003 00:52:51 -0000	1.56
  +++ readwrite.c	4 Mar 2003 22:19:38 -0000	1.57
  @@ -343,9 +343,7 @@
               break;
           }
           
  -        if (str[i] == '\r' || str[i] == '\x1A')
  -            i--;
  -        else if (str[i] == '\n') {
  +        if (str[i] == '\n') {
               i++;
               break;
           }
  
  
  
  1.78      +1 -3      apr/file_io/win32/readwrite.c
  
  Index: readwrite.c
  ===================================================================
  RCS file: /home/cvs/apr/file_io/win32/readwrite.c,v
  retrieving revision 1.77
  retrieving revision 1.78
  diff -u -r1.77 -r1.78
  --- readwrite.c	24 Jan 2003 18:25:31 -0000	1.77
  +++ readwrite.c	4 Mar 2003 22:19:38 -0000	1.78
  @@ -452,9 +452,7 @@
               break;
           }
           
  -        if (str[i] == '\r' || str[i] == '\x1A')
  -            i--; /* don't keep this char */
  -        else if (str[i] == '\n') {
  +        if (str[i] == '\n') {
               i++; /* don't clobber this char below */
               break;
           }