Merge FSF address changes from 1.1 branch.

--HG--
rename : src/combined/decoder_flac.c => src/combined/flac_decoder.c
rename : src/combined/demux_flac.c => src/combined/flac_demuxer.c
rename : src/libxineadec/nsf.c => src/combined/nsf_decoder.c
rename : src/demuxers/demux_nsf.c => src/combined/nsf_demuxer.c
rename : src/combined/combined_wavpack.c => src/combined/wavpack_combined.c
rename : src/combined/combined_wavpack.h => src/combined/wavpack_combined.h
rename : src/combined/decoder_wavpack.c => src/combined/wavpack_decoder.c
rename : src/combined/demux_wavpack.c => src/combined/wavpack_demuxer.c
rename : src/demuxers/demux_ogg.c => src/combined/xine_ogg_demuxer.c
rename : src/libxineadec/xine_speex_decoder.c => src/combined/xine_speex_decoder.c
rename : src/libxinevdec/xine_theora_decoder.c => src/combined/xine_theora_decoder.c
rename : src/libxineadec/xine_vorbis_decoder.c => src/combined/xine_vorbis_decoder.c
rename : src/liba52/xine_a52_decoder.c => src/libxineadec/xine_a52_decoder.c
rename : src/libdts/xine_dts_decoder.c => src/libxineadec/xine_dts_decoder.c
rename : src/libfaad/xine_faad_decoder.c => src/libxineadec/xine_faad_decoder.c
rename : src/libmusepack/xine_musepack_decoder.c => src/libxineadec/xine_musepack_decoder.c

1 files changed, 24 insertions, 5 deletions

diff --git a/src/xine-utils/xmllexer.c b/src/xine-utils/xmllexer.c
index c0f314699..a9fcd9e31 100644
--- a/src/xine-utils/xmllexer.c
+++ b/src/xine-utils/xmllexer.c
@@ -15,8 +15,8 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with the Gnome Library; see the file COPYING.LIB.  If not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth
+ * Floor, Boston, MA 02110, USA
  *
  *  $Id: xmllexer.c,v 1.13 2007/03/04 16:19:12 hadess Exp $
  *
@@ -39,6 +39,9 @@
 #include <ctype.h>
 #include <string.h>
 #include <stdlib.h>
+#ifdef HAVE_ICONV
+#include <iconv.h>
+#endif
 
 /* private constants*/
 
@@ -521,7 +524,7 @@ char *lexer_decode_entities (const char *tok)
     {
       /* parse the character entity (on failure, treat it as literal text) */
       const char *tp = tok;
-      long i;
+      signed long i;
 
       for (i = 0; lexer_entities[i].code; ++i)
 	if (!strncmp (lexer_entities[i].name, tok, lexer_entities[i].namelen)
@@ -549,7 +552,7 @@ char *lexer_decode_entities (const char *tok)
       else
 	i = strtol (tp, (char **)&tp, 10);
 
-      if (i < 1 || i > 255 || *tp != ';')
+      if (*tp != ';' || i < 1)
       {
         /* out of range, or format error */
 	*bp++ = '&';
@@ -557,7 +560,23 @@ char *lexer_decode_entities (const char *tok)
       }
 
       tok = tp + 1;
-      *bp++ = i;
+
+      if (i < 128)
+        /* ASCII - store as-is */
+	*bp++ = i;
+      else
+      {
+	/* Non-ASCII, so convert to UTF-8 */
+	int count = (i >= 0x04000000) ? 5 :
+		    (i >= 0x00200000) ? 4 :
+		    (i >= 0x00010000) ? 3 :
+		    (i >= 0x00000800) ? 2 : 1;
+	*bp = (char)(0x1F80 >> count);
+	count *= 6;
+	*bp++ |= i >> count;
+	while ((count -= 6) >= 0)
+	  *bp++ = 128 | ((i >> count) & 0x3F);
+      }
     }
   }
   *bp = 0;