From d5fabce17c179ec314a107796bfb08c8214a3477 Mon Sep 17 00:00:00 2001 From: "mostafah%oeone.com" Date: Fri, 10 Sep 2004 13:38:38 +0000 Subject: [PATCH] Updated parts of code from libical.cvs which removes hardcoded LF Bug 254356: incorrect line endings --- other-licenses/libical/src/libical/icalcomponent.c | 6 +----- other-licenses/libical/src/libical/icalproperty.c | 10 ++++++---- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/other-licenses/libical/src/libical/icalcomponent.c b/other-licenses/libical/src/libical/icalcomponent.c index ac9a3dafee3..ee2c59dec47 100644 --- a/other-licenses/libical/src/libical/icalcomponent.c +++ b/other-licenses/libical/src/libical/icalcomponent.c @@ -2,7 +2,7 @@ FILE: icalcomponent.c CREATOR: eric 28 April 1999 - $Id: icalcomponent.c,v 1.14 2004-03-12 20:14:52 mostafah%oeone.com Exp $ + $Id: icalcomponent.c,v 1.15 2004-09-10 13:38:38 mostafah%oeone.com Exp $ (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org @@ -283,15 +283,11 @@ icalcomponent_as_ical_string (icalcomponent* component) pvl_elem itr; struct icalcomponent_impl *impl = (struct icalcomponent_impl*)component; -/* WIN32 automatically adds the \r, Anybody else need it? #ifdef ICAL_UNIX_NEWLINE -*/ char newline[] = "\n"; -/* #else char newline[] = "\r\n"; #endif -*/ icalcomponent *c; icalproperty *p; diff --git a/other-licenses/libical/src/libical/icalproperty.c b/other-licenses/libical/src/libical/icalproperty.c index 7e698aefb61..0517f51b46f 100644 --- a/other-licenses/libical/src/libical/icalproperty.c +++ b/other-licenses/libical/src/libical/icalproperty.c @@ -4,7 +4,7 @@ FILE: icalproperty.c CREATOR: eric 28 April 1999 - $Id: icalproperty.c,v 1.5 2004-09-07 16:12:29 mostafah%oeone.com Exp $ + $Id: icalproperty.c,v 1.6 2004-09-10 13:38:38 mostafah%oeone.com Exp $ (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org @@ -197,10 +197,12 @@ icalproperty* icalproperty_new_from_string(const char* str) /* Is this a HACK or a crafty reuse of code? */ - icalmemory_append_string(&buf, &buf_ptr, &buf_size, "BEGIN:VCALENDAR\n"); + icalmemory_append_string(&buf, &buf_ptr, &buf_size, "BEGIN:VCALENDAR"); + icalmemory_append_string(&buf, &buf_ptr, &buf_size, newline); icalmemory_append_string(&buf, &buf_ptr, &buf_size, str); - icalmemory_append_string(&buf, &buf_ptr, &buf_size, newline); - icalmemory_append_string(&buf, &buf_ptr, &buf_size, "END:VCALENDAR\n"); + icalmemory_append_string(&buf, &buf_ptr, &buf_size, newline); + icalmemory_append_string(&buf, &buf_ptr, &buf_size, "END:VCALENDAR"); + icalmemory_append_string(&buf, &buf_ptr, &buf_size, newline); comp = icalparser_parse_string(buf);