mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-05-01 05:08:10 -07:00
56bd759df1
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
65 lines
1.7 KiB
Diff
65 lines
1.7 KiB
Diff
? entity.patch
|
|
Index: tinyxml.cpp
|
|
===================================================================
|
|
RCS file: /cvsroot/tinyxml/tinyxml/tinyxml.cpp,v
|
|
retrieving revision 1.105
|
|
diff -u -r1.105 tinyxml.cpp
|
|
--- tinyxml.cpp 5 Jun 2010 19:06:57 -0000 1.105
|
|
+++ tinyxml.cpp 19 Jul 2010 21:24:16 -0000
|
|
@@ -57,30 +57,7 @@
|
|
{
|
|
unsigned char c = (unsigned char) str[i];
|
|
|
|
- if ( c == '&'
|
|
- && i < ( (int)str.length() - 2 )
|
|
- && str[i+1] == '#'
|
|
- && str[i+2] == 'x' )
|
|
- {
|
|
- // Hexadecimal character reference.
|
|
- // Pass through unchanged.
|
|
- // © -- copyright symbol, for example.
|
|
- //
|
|
- // The -1 is a bug fix from Rob Laveaux. It keeps
|
|
- // an overflow from happening if there is no ';'.
|
|
- // There are actually 2 ways to exit this loop -
|
|
- // while fails (error case) and break (semicolon found).
|
|
- // However, there is no mechanism (currently) for
|
|
- // this function to return an error.
|
|
- while ( i<(int)str.length()-1 )
|
|
- {
|
|
- outString->append( str.c_str() + i, 1 );
|
|
- ++i;
|
|
- if ( str[i] == ';' )
|
|
- break;
|
|
- }
|
|
- }
|
|
- else if ( c == '&' )
|
|
+ if ( c == '&' )
|
|
{
|
|
outString->append( entity[0].str, entity[0].strLength );
|
|
++i;
|
|
Index: xmltest.cpp
|
|
===================================================================
|
|
RCS file: /cvsroot/tinyxml/tinyxml/xmltest.cpp,v
|
|
retrieving revision 1.89
|
|
diff -u -r1.89 xmltest.cpp
|
|
--- xmltest.cpp 5 Jun 2010 17:41:52 -0000 1.89
|
|
+++ xmltest.cpp 19 Jul 2010 21:24:16 -0000
|
|
@@ -1340,6 +1340,16 @@
|
|
}*/
|
|
}
|
|
|
|
+ #ifdef TIXML_USE_STL
|
|
+ {
|
|
+ TiXmlDocument xml;
|
|
+ xml.Parse("<foo>foo&#xa+bar</foo>");
|
|
+ std::string str;
|
|
+ str << xml;
|
|
+ XmlTest( "Entity escaping", "<foo>foo&#xa+bar</foo>", str.c_str() );
|
|
+ }
|
|
+ #endif
|
|
+
|
|
/* 1417717 experiment
|
|
{
|
|
TiXmlDocument xml;
|