[SCM] libgnokii and core programs branch, master, updated. rel_0_6_29-278-g08a8745

[Daniele Forsi]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "libgnokii and core programs".

The branch, master has been updated
       via  08a87450666d84e5e346df709eb9043287533084 (commit)
      from  a3e1670666cda7f091af38f2a7bd13cf6d3a900d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/gnokii.git/commit/?id=08a87450666d84e5e346df709eb9043287533084


commit 08a87450666d84e5e346df709eb9043287533084
Author: Daniele Forsi <address@hidden>
Date:   Sun Jul 10 18:21:21 2011 +0200

    Make the vcard reader unfold correctly when lines end with \r\n
    
    Replace \r\n with \n.

diff --git a/ChangeLog b/ChangeLog
index 3e60cdd..b8928fe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -29,6 +29,8 @@
     o make the vcard writer handle also the date property in DC,
       MC, RC (the reader will ignore it) and ignore X-GNOKII-70 and
       X-GNOKII-71 (they are part of the N property) (Daniele Forsi)
+    o make the vcard reader unfold correctly when lines end with CR
+      LF                                            (Daniele Forsi)
  * nk6510 driver updates
     o fix calendar handling issues (few off-by-ones)    (Paweł Kot)
     o implement deletecalendarnote for series40 3rd+ Ed (Paweł Kot)
diff --git a/common/vcard.c b/common/vcard.c
index 07fb0f6..53e5a91 100644
--- a/common/vcard.c
+++ b/common/vcard.c
@@ -390,6 +390,11 @@ GNOKII_API int gn_vcardstr2phonebook(const char *vcard, 
gn_phonebook_entry *entr
 
        /* Remove folding */
        v = strdup(vcard);
+       fold = strstr(v, "\r\n");
+       while (fold != NULL) {
+               memmove(fold, fold + 1, strlen(fold));
+               fold = strstr(fold, "\r\n");
+       }
        fold = strstr(v, "\n ");
        while (fold != NULL) {
                memmove(fold, fold + 2, strlen(fold) - 1);

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog      |    2 ++
 common/vcard.c |    5 +++++
 2 files changed, 7 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
libgnokii and core programs