[Mldonkey-commits] mldonkey distrib/ChangeLog src/utils/xml-light/...

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       10/09/08 16:41:25

Modified files:
        distrib        : ChangeLog 
        src/utils/xml-light: xml_lexer.mll 

Log message:
        patch #7305

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1475&r2=1.1476
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/utils/xml-light/xml_lexer.mll?cvsroot=mldonkey&r1=1.3&r2=1.4

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1475
retrieving revision 1.1476
diff -u -b -r1.1475 -r1.1476
--- distrib/ChangeLog   8 Sep 2010 16:40:29 -0000       1.1475
+++ distrib/ChangeLog   8 Sep 2010 16:41:22 -0000       1.1476
@@ -15,6 +15,7 @@
 =========
 
 2010/09/08
+7305: Xml-light: fix attributes parsing (ygrek)
 7310: EDK: improve comment port option (ygrek)
 7308: DC: handle ADCGET list (ygrek)
 7307: New make target "tests" for unit tests (ygrek)

Index: src/utils/xml-light/xml_lexer.mll
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/utils/xml-light/xml_lexer.mll,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- src/utils/xml-light/xml_lexer.mll   26 Jan 2006 10:40:01 -0000      1.3
+++ src/utils/xml-light/xml_lexer.mll   8 Sep 2010 16:41:23 -0000       1.4
@@ -308,11 +308,8 @@
 and dq_string = parse
   | '"'
       { Buffer.contents tmp }
-  | '\\' [ '"' '\\' ]
-      {
-      Buffer.add_char tmp (lexeme_char lexbuf 1);
-      dq_string lexbuf
-    }
+  | '&'
+      { Buffer.add_string tmp (entity lexbuf); dq_string lexbuf }
   | eof
       { raise (Error EUnterminatedString) }
   | _
@@ -324,11 +321,8 @@
 and q_string = parse
   | '\''
       { Buffer.contents tmp }
-  | '\\' [ '\'' '\\' ]
-      {
-      Buffer.add_char tmp (lexeme_char lexbuf 1);
-      q_string lexbuf
-    }
+  | '&'
+      { Buffer.add_string tmp (entity lexbuf); q_string lexbuf }
   | eof
       { raise (Error EUnterminatedString) }
   | _