Newsgroups: php.internals
Path: news.php.net
Xref: news.php.net php.internals:41323
Mailing-List: contact internals-help@lists.php.net; run by ezmlm
Received-SPF: pass (pb1.pair.com: domain gmail.com designates 64.233.182.188 as permitted sender)
DomainKey-Status: bad
DomainKey-Signature: a=rsa-sha1; c=nofws;
        d=gmail.com; s=gamma;
        h=message-id:date:from:sender:to:subject:cc:in-reply-to:mime-version
         :content-type:references:x-google-sender-auth;
        b=mHkxBxcD1Iah0SOEynpdtWo4FcY+/7Zdk1cWyogszV2ijYZjuhrR0BuktQew4MjfOD
         IkhxYOofF5H2cJQ0RgbcIuoKBpSsgq6uFf7Ku3dwJwNfLNv2k7+h2Ore44hm2NPvkmz+
         MytpoqQpl1Bx0lzR2MiNQ5XPxO85f9piXygZY=
Message-ID: <2a9adcf0810221135h1e6ed4ecub55318cfb26b3e7e@mail.gmail.com>
Date: Wed, 22 Oct 2008 11:35:49 -0700
Sender: jmertic@gmail.com
To: "Lars Strojny" <lstrojny@php.net>
Cc: internals@lists.php.net
In-Reply-To: <1224696974.17075.1.camel@localhost>
MIME-Version: 1.0
Content-Type: multipart/mixed; 
	boundary="----=_Part_33645_4421838.1224700549790"
References: <2a9adcf0810221003i70f37558ob5777b5603865cdf@mail.gmail.com>
	 <1224696974.17075.1.camel@localhost>
Subject: Re: [PHP-DEV] [PATCH] Bug #46367 - fputcsv does not add the correct newline character on Windows
From: jmertic@php.net ("John Mertic")

------=_Part_33645_4421838.1224700549790
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

Hi Lars,

Thanks for the pointers, updated the patch and added a test.

Index: file.c
===================================================================
RCS file: /repository/php-src/ext/standard/file.c,v
retrieving revision 1.530
diff -u -r1.530 file.c
--- file.c	21 Oct 2008 22:06:48 -0000	1.530
+++ file.c	22 Oct 2008 18:21:10 -0000
@@ -2104,7 +2104,7 @@
 		}
 	}

-	smart_str_appendc(&csvline, '\n');
+	smart_str_appendc(&csvline, PHP_EOL);
 	smart_str_0(&csvline);

 	ret = php_stream_write(stream, csvline.c, csvline.len);


John Mertic
jmertic@gmail.com
http://jmertic.wordpress.com

"Explaining a joke is like dissecting a frog: you understand it
better, but the frog dies
in the process." --Mark Twain



On Wed, Oct 22, 2008 at 10:36 AM, Lars Strojny <lstrojny@php.net> wrote:
> Hi John,
>
>
> Am Mittwoch, den 22.10.2008, 10:03 -0700 schrieb John Mertic:
> [...]
>> Below is a patch to fix this issue; it uses the constant PHP_EOL to
>> get the correct newline to use on the current platform:
>
> Thanks for your patch. A few things to mention, as it is your first
> patch: please use "diff -ru" to create unified diffs. Also we try to
> always add tests for the things we fix or create. Would you mind
> creating a test for the fix you sent to make sure no regression happens
> in the next n years?
>
> Thanks, Lars
> --
>   Jabber: lars@strojny.net
>   Weblog: http://usrportage.de
>

------=_Part_33645_4421838.1224700549790--