You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by bj...@apache.org on 2005/07/04 11:29:10 UTC

svn commit: r209046 - /apr/apr/branches/1.0.x/file_io/os2/open.c

Author: bjh
Date: Mon Jul  4 02:29:09 2005
New Revision: 209046

URL: http://svn.apache.org/viewcvs?rev=209046&view=rev
Log:
Bug #33844: OS/2: file opened with APR_CREATE would be truncated if APR_APPEND
wasn't also given.

Backport from trunk of r180013

Modified:
    apr/apr/branches/1.0.x/file_io/os2/open.c

Modified: apr/apr/branches/1.0.x/file_io/os2/open.c
URL: http://svn.apache.org/viewcvs/apr/apr/branches/1.0.x/file_io/os2/open.c?rev=209046&r1=209045&r2=209046&view=diff
==============================================================================
--- apr/apr/branches/1.0.x/file_io/os2/open.c (original)
+++ apr/apr/branches/1.0.x/file_io/os2/open.c Mon Jul  4 02:29:09 2005
@@ -66,12 +66,10 @@
     }
 
     if (flag & APR_CREATE) {
-        oflags |= OPEN_ACTION_CREATE_IF_NEW; 
-        if (!(flag & APR_EXCL)) {
-            if (flag & APR_APPEND)
-                oflags |= OPEN_ACTION_OPEN_IF_EXISTS;
-            else
-                oflags |= OPEN_ACTION_REPLACE_IF_EXISTS;
+        oflags |= OPEN_ACTION_CREATE_IF_NEW;
+
+        if (!(flag & APR_EXCL) && !(flag & APR_TRUNCATE)) {
+            oflags |= OPEN_ACTION_OPEN_IF_EXISTS;
         }
     }
     



Re: svn commit: r209046 - /apr/apr/branches/1.0.x/file_io/os2/open.c

Posted by Joe Orton <jo...@redhat.com>.
On Wed, Jul 06, 2005 at 09:17:46AM -0400, Jeff Trawick wrote:
> On 7/6/05, Brian Havard <br...@kheldar.apana.org.au> wrote:
> > On Tue, 05 Jul 2005 11:15:51 -0500, William A. Rowe, Jr. wrote:
> > 
> > >I'm not asking about Brian's patch, but how we are maintaining
> > >1.0.x/1.1.x branches...
> > >
> > >Can we declare these 'dead'?  For all intents and purposes, anyone
> > >building 1.2.x has an ABI compatible flavor that can be substituted
> > >for a 1.0.x or 1.1.x version, right?
> > 
> > Good question. I'm not really clear on what the state of the different
> > branches is. I'm just committing all the way back to 0.9.x to make sure the
> > next httpd-2.0.x gets these bug fixes.
> 
> I'm fuzzy when it comes to practical matters, such as who (if anybody)
> is the benificiary of those other branches.  Aren't those theoretical
> beneficiaries better off in the long run if we concentrate our efforts
> on a fewer number of branches?   (But we have to have a versioning
> policy that allows the fewer number of branches without slowing down
> the implementation of new features unnecessarily.)

Maintaining simple fixes on a "stable" 1.1.x branch is useful since it 
means 1.1.x patch releases can be released on a whim regardless of the 
state of the trunk.  I share the general apathy about the the 1.0.x 
branch.

joe

Re: svn commit: r209046 - /apr/apr/branches/1.0.x/file_io/os2/open.c

Posted by Jeff Trawick <tr...@gmail.com>.
On 7/6/05, Brian Havard <br...@kheldar.apana.org.au> wrote:
> On Tue, 05 Jul 2005 11:15:51 -0500, William A. Rowe, Jr. wrote:
> 
> >I'm not asking about Brian's patch, but how we are maintaining
> >1.0.x/1.1.x branches...
> >
> >Can we declare these 'dead'?  For all intents and purposes, anyone
> >building 1.2.x has an ABI compatible flavor that can be substituted
> >for a 1.0.x or 1.1.x version, right?
> 
> Good question. I'm not really clear on what the state of the different
> branches is. I'm just committing all the way back to 0.9.x to make sure the
> next httpd-2.0.x gets these bug fixes.

I'm fuzzy when it comes to practical matters, such as who (if anybody)
is the benificiary of those other branches.  Aren't those theoretical
beneficiaries better off in the long run if we concentrate our efforts
on a fewer number of branches?   (But we have to have a versioning
policy that allows the fewer number of branches without slowing down
the implementation of new features unnecessarily.)

Re: svn commit: r209046 - /apr/apr/branches/1.0.x/file_io/os2/open.c

Posted by Brian Havard <br...@kheldar.apana.org.au>.
On Tue, 05 Jul 2005 11:15:51 -0500, William A. Rowe, Jr. wrote:

>I'm not asking about Brian's patch, but how we are maintaining
>1.0.x/1.1.x branches...
>
>Can we declare these 'dead'?  For all intents and purposes, anyone
>building 1.2.x has an ABI compatible flavor that can be substituted
>for a 1.0.x or 1.1.x version, right?

Good question. I'm not really clear on what the state of the different
branches is. I'm just committing all the way back to 0.9.x to make sure the
next httpd-2.0.x gets these bug fixes.



>Bill
>
>At 04:29 AM 7/4/2005, bjh@apache.org wrote:
>>Author: bjh
>>Date: Mon Jul  4 02:29:09 2005
>>New Revision: 209046
>>
>>URL: http://svn.apache.org/viewcvs?rev=209046&view=rev
>>Log:
>>Bug #33844: OS/2: file opened with APR_CREATE would be truncated if APR_APPEND
>>wasn't also given.
>
>
>

-- 
 ______________________________________________________________________________
 |  Brian Havard                 |  "He is not the messiah!                   |
 |  brianh@kheldar.apana.org.au  |  He's a very naughty boy!" - Life of Brian |
 ------------------------------------------------------------------------------


Re: svn commit: r209046 - /apr/apr/branches/1.0.x/file_io/os2/open.c

Posted by "William A. Rowe, Jr." <wr...@rowe-clan.net>.
I'm not asking about Brian's patch, but how we are maintaining
1.0.x/1.1.x branches...

Can we declare these 'dead'?  For all intents and purposes, anyone
building 1.2.x has an ABI compatible flavor that can be substituted
for a 1.0.x or 1.1.x version, right?

Bill

At 04:29 AM 7/4/2005, bjh@apache.org wrote:
>Author: bjh
>Date: Mon Jul  4 02:29:09 2005
>New Revision: 209046
>
>URL: http://svn.apache.org/viewcvs?rev=209046&view=rev
>Log:
>Bug #33844: OS/2: file opened with APR_CREATE would be truncated if APR_APPEND
>wasn't also given.