AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

fix unicode validation when reading a file

Browse Source 
2000-12-14  Havoc Pennington  <hp@redhat.com>

	* gtk/testtext.c (fill_file_buffer): fix unicode validation when
	reading a file
This commit is contained in:
Havoc Pennington 2000-12-15 00:52:00 +00:00 committed by Havoc Pennington
parent 94ec8cff93
commit 2142a98c9e
9 changed files with 41 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2000-12-14 Havoc Pennington <hp@redhat.com>
* gtk/testtext.c (fill_file_buffer): fix unicode validation when
reading a file
2000-12-14 Havoc Pennington <hp@redhat.com> 2000-12-14 Havoc Pennington <hp@redhat.com>
* gtk/gtktextbtree.c (_gtk_text_btree_validate_line): remove * gtk/gtktextbtree.c (_gtk_text_btree_validate_line): remove

5
ChangeLog.pre-2-0
View File

@ -1,3 +1,8 @@
2000-12-14 Havoc Pennington <hp@redhat.com>
* gtk/testtext.c (fill_file_buffer): fix unicode validation when
reading a file
2000-12-14 Havoc Pennington <hp@redhat.com> 2000-12-14 Havoc Pennington <hp@redhat.com>
* gtk/gtktextbtree.c (_gtk_text_btree_validate_line): remove * gtk/gtktextbtree.c (_gtk_text_btree_validate_line): remove

5
ChangeLog.pre-2-10
View File

@ -1,3 +1,8 @@
2000-12-14 Havoc Pennington <hp@redhat.com>
* gtk/testtext.c (fill_file_buffer): fix unicode validation when
reading a file
2000-12-14 Havoc Pennington <hp@redhat.com> 2000-12-14 Havoc Pennington <hp@redhat.com>
* gtk/gtktextbtree.c (_gtk_text_btree_validate_line): remove * gtk/gtktextbtree.c (_gtk_text_btree_validate_line): remove

5
ChangeLog.pre-2-2
View File

@ -1,3 +1,8 @@
2000-12-14 Havoc Pennington <hp@redhat.com>
* gtk/testtext.c (fill_file_buffer): fix unicode validation when
reading a file
2000-12-14 Havoc Pennington <hp@redhat.com> 2000-12-14 Havoc Pennington <hp@redhat.com>
* gtk/gtktextbtree.c (_gtk_text_btree_validate_line): remove * gtk/gtktextbtree.c (_gtk_text_btree_validate_line): remove

5
ChangeLog.pre-2-4
View File

@ -1,3 +1,8 @@
2000-12-14 Havoc Pennington <hp@redhat.com>
* gtk/testtext.c (fill_file_buffer): fix unicode validation when
reading a file
2000-12-14 Havoc Pennington <hp@redhat.com> 2000-12-14 Havoc Pennington <hp@redhat.com>
* gtk/gtktextbtree.c (_gtk_text_btree_validate_line): remove * gtk/gtktextbtree.c (_gtk_text_btree_validate_line): remove

5
ChangeLog.pre-2-6
View File

@ -1,3 +1,8 @@
2000-12-14 Havoc Pennington <hp@redhat.com>
* gtk/testtext.c (fill_file_buffer): fix unicode validation when
reading a file
2000-12-14 Havoc Pennington <hp@redhat.com> 2000-12-14 Havoc Pennington <hp@redhat.com>
* gtk/gtktextbtree.c (_gtk_text_btree_validate_line): remove * gtk/gtktextbtree.c (_gtk_text_btree_validate_line): remove

5
ChangeLog.pre-2-8
View File

@ -1,3 +1,8 @@
2000-12-14 Havoc Pennington <hp@redhat.com>
* gtk/testtext.c (fill_file_buffer): fix unicode validation when
reading a file
2000-12-14 Havoc Pennington <hp@redhat.com> 2000-12-14 Havoc Pennington <hp@redhat.com>
* gtk/gtktextbtree.c (_gtk_text_btree_validate_line): remove * gtk/gtktextbtree.c (_gtk_text_btree_validate_line): remove

14
gtk/testtext.c
View File

@ -638,22 +638,14 @@ fill_file_buffer (GtkTextBuffer *buffer, const char *filename)
while (!feof (f)) while (!feof (f))
{ {
gint count; gint count;
char *leftover, *next; const char *leftover;
int to_read = 2047 - remaining; int to_read = 2047 - remaining;
count = fread (buf + remaining, 1, to_read, f); count = fread (buf + remaining, 1, to_read, f);
buf[count + remaining] = '\0'; buf[count + remaining] = '\0';
leftover = next = buf; g_utf8_validate (buf, -1, &leftover);
while (next)
{
leftover = next;
if (!*leftover)
break;
next = g_utf8_find_next_char (next, buf + count + remaining);
}
g_assert (g_utf8_validate (buf, leftover - buf, NULL)); g_assert (g_utf8_validate (buf, leftover - buf, NULL));
gtk_text_buffer_insert (buffer, &iter, buf, leftover - buf); gtk_text_buffer_insert (buffer, &iter, buf, leftover - buf);

14
tests/testtext.c
View File

@ -638,22 +638,14 @@ fill_file_buffer (GtkTextBuffer *buffer, const char *filename)
while (!feof (f)) while (!feof (f))
{ {
gint count; gint count;
char *leftover, *next; const char *leftover;
int to_read = 2047 - remaining; int to_read = 2047 - remaining;
count = fread (buf + remaining, 1, to_read, f); count = fread (buf + remaining, 1, to_read, f);
buf[count + remaining] = '\0'; buf[count + remaining] = '\0';
leftover = next = buf; g_utf8_validate (buf, -1, &leftover);
while (next)
{
leftover = next;
if (!*leftover)
break;
next = g_utf8_find_next_char (next, buf + count + remaining);
}
g_assert (g_utf8_validate (buf, leftover - buf, NULL)); g_assert (g_utf8_validate (buf, leftover - buf, NULL));
gtk_text_buffer_insert (buffer, &iter, buf, leftover - buf); gtk_text_buffer_insert (buffer, &iter, buf, leftover - buf);