diff options
| -rw-r--r-- | addressbook/ChangeLog | 7 | ||||
| -rw-r--r-- | addressbook/backend/ebook/evolution-ldif-importer.c | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index 09807f40f1..ecacba942b 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,5 +1,12 @@ 2002-11-22 Chris Toshok <toshok@ximian.com> + [ roll forward Sean.Gao@sun.com's fix for #16870 from the 1.2 + branch ] + * backend/ebook/evolution-ldif-importer.c (getNextLDIFEntry): + check for both LR and CRLF as empty line markers. + +2002-11-22 Chris Toshok <toshok@ximian.com> + [ rolling forward fix for #34254 from 1.2 branch ] * backend/ebook/evolution-vcard-importer.c (check_file_is_vcard): use g-ascii_strncasecmp instead of strncmp. diff --git a/addressbook/backend/ebook/evolution-ldif-importer.c b/addressbook/backend/ebook/evolution-ldif-importer.c index 8ec5b631ab..e0a85e685c 100644 --- a/addressbook/backend/ebook/evolution-ldif-importer.c +++ b/addressbook/backend/ebook/evolution-ldif-importer.c @@ -304,7 +304,7 @@ getNextLDIFEntry( FILE *f ) while (!feof (f)) { if (!fgets (line, sizeof(line), f)) break; - if (line[0] == '\n') + if (line[0] == '\n' || (line[0] == '\r' && line[1] == '\n')) break; str = g_string_append (str, line); } |