diff --exclude-from=c:\util\tool\diff.ign -u -r from-cvs/dia/lib/dia_xml.c my-gtk/dia/lib/dia_xml.c --- from-cvs/dia/lib/dia_xml.c Mon May 20 19:26:30 2002 +++ my-gtk/dia/lib/dia_xml.c Mon Jun 03 21:23:08 2002 @@ -133,13 +133,17 @@ do { int i; for (i = 0; i < len; i++) - if (buf[i] & 0x80) + if (buf[i] & 0x80 || buf[i] == '&') well_formed_utf8 = FALSE; len = gzread(zf,buf,BUFLEN); } while (len > 0 && well_formed_utf8); if (well_formed_utf8) { gzclose(zf); /* this file is utf-8 compatible */ return filename; + } else { + gzclose(zf); /* poor mans fseek */ + zf = gzopen(filename,"rb"); + len = gzread(zf,buf,BUFLEN); } if (0 != strcmp(default_enc,"UTF-8")) {