debian/midori
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Handle long lines when importing Opera bookmarks

Browse source
This commit is contained in:
Christian Dywan 2009-12-02 23:46:34 +01:00
parent 8c2d74c966
commit ded1573054
1 changed files with 27 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
midori/midori-array.c
View file

@ -245,11 +245,13 @@ katze_array_from_opera_file (KatzeArray* array,
FILE* file) FILE* file)
{ {
gchar line[200]; gchar line[200];
gchar* partial_line = NULL;
KatzeArray* folder = array; KatzeArray* folder = array;
KatzeItem* item = NULL; KatzeItem* item = NULL;
while (fgets (line, 200, file)) while (fgets (line, 200, file))
{ {
gboolean incomplete_line = (strlen (line) == 199);
g_strstrip (line); g_strstrip (line);
if (line[0] == '\0') if (line[0] == '\0')
{ {
@ -285,7 +287,31 @@ katze_array_from_opera_file (KatzeArray* array,
} }
else if (item) else if (item)
{ {
gchar** parts = g_strsplit (line, "=", 2); gchar** parts;
/* Handle lines longer than 200 characters */
if (incomplete_line)
{
if (partial_line)
{
gchar* chunk = g_strconcat (partial_line, line, NULL);
katze_assign (partial_line, chunk);
}
else
partial_line = g_strdup (line);
continue;
}
if (partial_line)
{
gchar* full_line = g_strconcat (partial_line, line, NULL);
katze_assign (partial_line, NULL);
parts = g_strsplit (full_line, "=", 2);
g_free (full_line);
}
else
parts = g_strsplit (line, "=", 2);
if (parts && parts[0] && parts[1]) if (parts && parts[0] && parts[1])
{ {
if (katze_str_equal (parts[0], "NAME")) if (katze_str_equal (parts[0], "NAME"))