From dev-return-18200-apmail-apr-dev-archive=apr.apache.org@apr.apache.org Wed Mar 21 14:38:44 2007 Return-Path: Delivered-To: apmail-apr-dev-archive@www.apache.org Received: (qmail 93411 invoked from network); 21 Mar 2007 14:38:43 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 21 Mar 2007 14:38:43 -0000 Received: (qmail 23066 invoked by uid 500); 21 Mar 2007 14:38:49 -0000 Delivered-To: apmail-apr-dev-archive@apr.apache.org Received: (qmail 23025 invoked by uid 500); 21 Mar 2007 14:38:49 -0000 Mailing-List: contact dev-help@apr.apache.org; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Id: Delivered-To: mailing list dev@apr.apache.org Received: (qmail 23014 invoked by uid 99); 21 Mar 2007 14:38:48 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 21 Mar 2007 07:38:48 -0700 X-ASF-Spam-Status: No, hits=-0.0 required=10.0 tests=SPF_HELO_PASS X-Spam-Check-By: apache.org Received-SPF: pass (herse.apache.org: local policy) Received: from [204.11.219.140] (HELO ls6.firehawksystems.com) (204.11.219.140) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 21 Mar 2007 07:38:39 -0700 Received: from [10.0.0.2] (adsl-75-46-68-167.dsl.ipltin.sbcglobal.net [75.46.68.167]) (authenticated bits=0) by ls6.firehawksystems.com (8.13.8/8.13.8) with ESMTP id l2LEc2Cd050293 (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=NO) for ; Wed, 21 Mar 2007 07:38:03 -0700 (PDT) Mime-Version: 1.0 (Apple Message framework v752.2) In-Reply-To: References: Content-Type: text/plain; charset=US-ASCII; delsp=yes; format=flowed Message-Id: <3006ABC6-7334-4D80-91A0-51C96CE48C0E@firehawksystems.com> Content-Transfer-Encoding: 7bit From: "Brian J. France" Subject: Re: mktemp.c patch Date: Wed, 21 Mar 2007 10:38:14 -0400 To: dev@apr.apache.org X-Mailer: Apple Mail (2.752.2) X-Virus-Scanned: ClamAV version 0.88.7, clamav-milter version 0.88.7 on ls6.firehawksystems.com X-Virus-Status: Clean X-Spam-Checker-Version: SpamAssassin 3.1.1 (2006-03-10) on ls6.firehawksystems.com X-Virus-Checked: Checked by ClamAV on apache.org X-Old-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00 autolearn=ham version=3.1.1 Doh! New patch (flag should have been flags). Brian On Mar 21, 2007, at 10:31 AM, Brian J. France wrote: > Here is a patch that makes apr_file_mktemp check for the > APR_FILE_NOCLEANUP flag and not register a cleanup passed in. > > APR_FILE_NOCLEANUP is being used in other places, but > APR_FOPEN_NOCLEANUP might be a better choice. > > Brian Index: mktemp.c =================================================================== --- mktemp.c (revision 520899) +++ mktemp.c (working copy) @@ -202,8 +202,10 @@ apr_os_file_put(fp, &fd, flags, p); (*fp)->fname = apr_pstrdup(p, template); - apr_pool_cleanup_register((*fp)->pool, (void *)(*fp), - apr_unix_file_cleanup, apr_unix_file_cleanup); + if (!(flags & APR_FILE_NOCLEANUP)) { + apr_pool_cleanup_register((*fp)->pool, (void *)(*fp), + apr_unix_file_cleanup, apr_unix_file_cleanup); + } #endif return APR_SUCCESS; }