From cvs-return-5148-apmail-apr-cvs-archive=apr.apache.org@apr.apache.org Sat Sep 20 07:07:35 2003 Return-Path: Delivered-To: apmail-apr-cvs-archive@www.apache.org Received: (qmail 17339 invoked from network); 20 Sep 2003 07:07:34 -0000 Received: from daedalus.apache.org (HELO mail.apache.org) (208.185.179.12) by minotaur-2.apache.org with SMTP; 20 Sep 2003 07:07:34 -0000 Received: (qmail 13943 invoked by uid 500); 20 Sep 2003 07:07:10 -0000 Delivered-To: apmail-apr-cvs-archive@apr.apache.org Received: (qmail 13823 invoked by uid 500); 20 Sep 2003 07:07:09 -0000 Mailing-List: contact cvs-help@apr.apache.org; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: Reply-To: dev@apr.apache.org Delivered-To: mailing list cvs@apr.apache.org Delivered-To: moderator for cvs@apr.apache.org Received: (qmail 29796 invoked from network); 19 Sep 2003 18:07:18 -0000 Date: 19 Sep 2003 18:07:26 -0000 Message-ID: <20030919180726.98386.qmail@minotaur.apache.org> From: stas@apache.org To: apr-cvs@apache.org Subject: cvs commit: apr/file_io/win32 filedup.c X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N stas 2003/09/19 11:07:26 Modified: . Tag: APR_0_9_BRANCH CHANGES file_io/win32 Tag: APR_0_9_BRANCH filedup.c Log: fix apr_file_dup() and apr_file_dup2() to dup the ungetchar member Revision Changes Path No revision No revision 1.426.2.2 +3 -0 apr/CHANGES Index: CHANGES =================================================================== RCS file: /home/cvs/apr/CHANGES,v retrieving revision 1.426.2.1 retrieving revision 1.426.2.2 diff -u -u -r1.426.2.1 -r1.426.2.2 --- CHANGES 17 Sep 2003 19:07:30 -0000 1.426.2.1 +++ CHANGES 19 Sep 2003 18:07:26 -0000 1.426.2.2 @@ -1,5 +1,8 @@ Changes with APR 0.9.4 + *) win32: fix apr_file_dup() and apr_file_dup2() to dup the + ungetchar member [Stas Bekman] + *) Preserve leading '../' segments as when merging to an empty and unrooted path - fixes a bug observed in SVN with Win32/Netware/OS2. [Mike Pilato , William Rowe] No revision No revision 1.54.2.1 +2 -0 apr/file_io/win32/filedup.c Index: filedup.c =================================================================== RCS file: /home/cvs/apr/file_io/win32/filedup.c,v retrieving revision 1.54 retrieving revision 1.54.2.1 diff -u -u -r1.54 -r1.54.2.1 --- filedup.c 7 Jan 2003 00:52:53 -0000 1.54 +++ filedup.c 19 Sep 2003 18:07:26 -0000 1.54.2.1 @@ -81,6 +81,7 @@ (*new_file)->fname = apr_pstrdup(p, old_file->fname); (*new_file)->append = old_file->append; (*new_file)->buffered = FALSE; + (*new_file)->ungetchar = old_file->ungetchar; apr_pool_cleanup_register((*new_file)->pool, (void *)(*new_file), file_cleanup, apr_pool_cleanup_null); @@ -150,6 +151,7 @@ new_file->fname = apr_pstrdup(new_file->pool, old_file->fname); new_file->append = old_file->append; new_file->buffered = FALSE; + new_file->ungetchar = old_file->ungetchar; return APR_SUCCESS; #endif /* !defined(_WIN32_WCE) */