*****************************************************************************
* Copyright (C) 2003-2004 Commonwealth Scientific and Industrial Research
* Organisation (CSIRO) Australia
- * Copyright (C) 2000-2004 VideoLAN
+ * Copyright (C) 2000-2004 the VideoLAN team
*
* $Id$
*
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
-#include <stdlib.h>
#include <vlc/vlc.h>
#include "vlc_xml.h"
+#include "vlc_block.h"
+#include "vlc_stream.h"
#include <ctype.h>
-#include <string.h>
#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
#undef XTAG_DEBUG
vlc_bool_t b_endtag;
};
-static xml_reader_t *ReaderCreate( xml_t *, const char * );
+static xml_reader_t *ReaderCreate( xml_t *, stream_t * );
static void ReaderDelete( xml_reader_t * );
static int ReaderRead( xml_reader_t * );
static int ReaderNodeType( xml_reader_t * );
static char *ReaderValue( xml_reader_t * );
static int ReaderNextAttr( xml_reader_t * );
+static int ReaderUseDTD ( xml_reader_t *, vlc_bool_t );
+
static void CatalogLoad( xml_t *, const char * );
static void CatalogAdd( xml_t *, const char *, const char *, const char * );
/*****************************************************************************
* Reader functions
*****************************************************************************/
-static xml_reader_t *ReaderCreate( xml_t *p_xml, const char *psz_filename )
+static xml_reader_t *ReaderCreate( xml_t *p_xml, stream_t *s )
{
xml_reader_t *p_reader;
- xml_reader_sys_t *p_sys;
- char *p_buffer;
- int i_buffer;
- FILE *file;
+ char *p_buffer, *p_new;
+ int i_size, i_pos = 0, i_buffer = 2048;
XTag *p_root;
/* Open and read file */
- file = fopen( psz_filename, "rt" );
- if( !file )
- {
- msg_Warn( p_xml, "could not open file '%s'", psz_filename );
- return 0;
+ p_buffer = malloc( i_buffer );
+ if( p_buffer == NULL ) {
+ msg_Err( p_xml, "out of memory" );
+ return NULL;
}
- fseek( file, 0L, SEEK_END );
- i_buffer = ftell( file );
- fseek( file, 0L, SEEK_SET );
- p_buffer = malloc( i_buffer + 1 );
- i_buffer = fread( p_buffer, 1, i_buffer, file );
- p_buffer[i_buffer] = 0;
- fclose( file );
+ while( ( i_size = stream_Read( s, &p_buffer[i_pos], 2048 ) ) == 2048 )
+ {
+ i_pos += i_size;
+ i_buffer += i_size;
+ p_new = realloc( p_buffer, i_buffer );
+ if (!p_new) {
+ msg_Err( p_xml, "out of memory" );
+ free( p_buffer );
+ return NULL;
+ }
+ p_buffer = p_new;
+ }
+ p_buffer[ i_pos + i_size ] = 0; /* 0 terminated string */
- if( !i_buffer )
+ if( i_pos + i_size == 0 )
{
- msg_Dbg( p_xml, "file '%s' is empty", psz_filename );
+ msg_Dbg( p_xml, "empty XML" );
free( p_buffer );
return 0;
}
p_root = xtag_new_parse( p_buffer, i_buffer );
if( !p_root )
{
- msg_Warn( p_xml, "couldn't parse file '%s'", psz_filename );
+ msg_Warn( p_xml, "couldn't parse XML" );
free( p_buffer );
return 0;
}
+ free( p_buffer );
p_reader = malloc( sizeof(xml_reader_t) );
- p_reader->p_sys = p_sys = malloc( sizeof(xml_reader_sys_t) );
+ p_reader->p_sys = malloc( sizeof(xml_reader_sys_t) );
p_reader->p_sys->p_root = p_root;
p_reader->p_sys->p_curtag = NULL;
p_reader->p_sys->p_curattr = NULL;
p_reader->pf_name = ReaderName;
p_reader->pf_value = ReaderValue;
p_reader->pf_next_attr = ReaderNextAttr;
+ p_reader->pf_use_dtd = ReaderUseDTD;
return p_reader;
}
free( p_reader );
}
+static int ReaderUseDTD ( xml_reader_t *p_reader, vlc_bool_t b_use )
+{
+ return VLC_EGENERIC;
+}
+
static int ReaderRead( xml_reader_t *p_reader )
{
XTag *p_child;
return 1;
}
- if( !p_reader->p_sys->b_endtag )
+ if( p_reader->p_sys->p_curtag->name && /* no end tag for pcdata */
+ !p_reader->p_sys->b_endtag )
{
p_reader->p_sys->b_endtag = VLC_TRUE;
return 1;
}
-
+
p_reader->p_sys->b_endtag = VLC_FALSE;
if( !p_reader->p_sys->p_curtag->parent ) return 0;
p_reader->p_sys->p_curtag = p_reader->p_sys->p_curtag->parent;
const char *psz_name;
if( !p_reader->p_sys->p_curattr )
+ {
psz_name = xtag_get_name( p_reader->p_sys->p_curtag );
+#ifdef XTAG_DEBUG
+ printf( "TAG: %s\n", psz_name );
+#endif
+ }
else
psz_name = ((XAttribute *)p_reader->p_sys->p_curattr->data)->name;
static char *ReaderValue( xml_reader_t *p_reader )
{
const char *psz_name;
+ if( p_reader->p_sys->p_curtag->pcdata )
+ {
+#ifdef XTAG_DEBUG
+ printf( "%s\n", p_reader->p_sys->p_curtag->pcdata );
+#endif
+ return strdup( p_reader->p_sys->p_curtag->pcdata );
+ }
if( !p_reader->p_sys->p_curattr ) return 0;
if( last->next == NULL ) break;
if( last ) last->next = l;
- l->prev = last;
+ l->prev = last;
return list;
}
#define X_SLASH 1<<6
#define X_QMARK 1<<7
#define X_DASH 1<<8
+#define X_EMARK 1<<9
static int xtag_cin( char c, int char_class )
{
if( char_class & X_SQUOTE ) if( c == '\'' ) return VLC_TRUE;
if( char_class & X_EQUAL ) if( c == '=' ) return VLC_TRUE;
if( char_class & X_SLASH ) if( c == '/' ) return VLC_TRUE;
- if( char_class & X_QMARK ) if( c == '!' ) return VLC_TRUE;
+ if( char_class & X_QMARK ) if( c == '?' ) return VLC_TRUE;
if( char_class & X_DASH ) if( c == '-' ) return VLC_TRUE;
+ if( char_class & X_EMARK ) if( c == '!' ) return VLC_TRUE;
return VLC_FALSE;
}
char *name;
char *pcdata;
char *s;
+ int xi;
if( !parser->valid ) return NULL;
- xtag_skip_whitespace (parser);
+ s = parser->start;
+
+ /* if this starts a comment tag, skip until end */
+ if( (parser->end - parser->start) > 7 &&
+ xtag_cin( s[0], X_OPENTAG ) && xtag_cin( s[1], X_EMARK ) &&
+ xtag_cin( s[2], X_DASH ) && xtag_cin( s[3], X_DASH ) )
+ {
+ parser->start = s = &s[4];
+ while( (xi = xtag_index( parser, X_DASH )) >= 0 )
+ {
+ parser->start = s = &s[xi+1];
+ if( xtag_cin( s[0], X_DASH ) && xtag_cin( s[1], X_CLOSETAG ) )
+ {
+ parser->start = &s[2];
+ xtag_skip_whitespace( parser );
+ return xtag_parse_tag( parser );
+ }
+ }
+ return NULL;
+ }
+
+ /* ignore processing instructions '<?' ... '?>' */
+ if( (parser->end - parser->start) > 4 &&
+ xtag_cin( s[0], X_OPENTAG ) && xtag_cin( s[1], X_QMARK ) )
+ {
+ parser->start = s = &s[2];
+ while ((xi = xtag_index( parser, X_QMARK )) >= 0) {
+ if (xtag_cin( s[xi+1], X_CLOSETAG )) {
+ parser->start = &s[xi+2];
+ xtag_skip_whitespace( parser );
+ return xtag_parse_tag( parser );
+ }
+ }
+ return NULL;
+ }
+
+ /* ignore doctype '<!DOCTYPE' ... '>' */
+ if ( (parser->end - parser->start) > 8 &&
+ !strncmp( s, "<!DOCTYPE", 9 ) ) {
+ xi = xtag_index( parser, X_CLOSETAG );
+ if ( xi > 0 ) {
+ parser->start = s = &s[xi+1];
+ xtag_skip_whitespace( parser );
+ return xtag_parse_tag( parser );
+ }
+ else {
+ return NULL;
+ }
+ }
if( (pcdata = xtag_slurp_to( parser, X_OPENTAG, X_NONE )) != NULL )
{
return tag;
}
- s = parser->start;
-
/* if this starts a close tag, return NULL and let the parent take it */
if( xtag_cin( s[0], X_OPENTAG ) && xtag_cin( s[1], X_SLASH ) )
return NULL;
- /* if this starts a comment tag, skip until end */
- if( xtag_cin( s[0], X_OPENTAG ) && xtag_cin( s[1], X_QMARK ) &&
- xtag_cin( s[2], X_DASH ) && xtag_cin( s[3], X_DASH ) )
- {
- int xi;
-
- parser->start = s = &s[4];
-
- while( (xi = xtag_index( parser, X_DASH )) >= 0 )
- {
- parser->start = s = &s[xi];
-
- if( xtag_cin( s[0], X_DASH ) && xtag_cin( s[1], X_DASH ) &&
- xtag_cin( s[2], X_CLOSETAG ) )
- {
- parser->start = &s[3];
- return xtag_parse_tag( parser );
+ /* parse CDATA content */
+ if ( (parser->end - parser->start) > 8 &&
+ !strncmp( s, "<![CDATA[", 9 ) ) {
+ parser->start = s = &s[9];
+ while (parser->end - s > 2) {
+ if (strncmp( s, "]]>", 3 ) == 0) {
+ if ( !(tag = malloc( sizeof(*tag))) ) return NULL;
+ if ( !(pcdata = malloc( sizeof(char)*(s - parser->start + 1))) ) return NULL;
+ strncpy( pcdata, parser->start, s - parser->start );
+ pcdata[s - parser->start]='\0';
+ parser->start = s = &s[3];
+ tag->name = NULL;
+ tag->pcdata = pcdata;
+ tag->parent = parser->current_tag;
+ tag->attributes = NULL;
+ tag->children = NULL;
+ tag->current_child = NULL;
+ return tag;
+ }
+ else {
+ s++;
}
}
-
return NULL;
}
- /* FIXME: if this starts a DOCTYPE tag, skip until end */
- if( xtag_cin( s[0], X_OPENTAG ) && xtag_cin( s[1], X_QMARK ) )
- {
- int xi = xtag_index( parser, X_CLOSETAG );
- if( xi <= 0 ) return NULL;
-
- parser->start = &s[xi+1];
- return xtag_parse_tag( parser );
- }
-
if( !xtag_assert_and_pass( parser, X_OPENTAG ) ) return NULL;
name = xtag_slurp_to( parser, X_WHITESPACE|X_SLASH|X_CLOSETAG, X_NONE );
}
}
- xtag_skip_whitespace (parser);
+ xtag_skip_whitespace( parser );
s = parser->start;
{
parser->current_tag = tag;
- xtag_assert_and_pass (parser, X_CLOSETAG);
+ xtag_assert_and_pass( parser, X_CLOSETAG );
while( (inner = xtag_parse_tag( parser ) ) != NULL )
{
tag->children = xlist_append( tag->children, inner );
}
- xtag_skip_whitespace (parser);
+ parser->current_tag = tag->parent;
+ xtag_skip_whitespace( parser );
- xtag_assert_and_pass (parser, X_OPENTAG);
- xtag_assert_and_pass (parser, X_SLASH);
- name = xtag_slurp_to (parser, X_WHITESPACE | X_CLOSETAG, X_NONE);
+ xtag_assert_and_pass( parser, X_OPENTAG );
+ xtag_assert_and_pass( parser, X_SLASH );
+ name = xtag_slurp_to( parser, X_WHITESPACE | X_CLOSETAG, X_NONE );
if( name )
{
if( strcmp( name, tag->name ) )
xtag_skip_whitespace( parser );
xtag_assert_and_pass( parser, X_CLOSETAG );
-
+ xtag_skip_whitespace( parser );
}
else
{
xtag_assert_and_pass( parser, X_SLASH );
xtag_assert_and_pass( parser, X_CLOSETAG );
+ xtag_skip_whitespace( parser );
}
return tag;
parser.start = (char *)s;
if( n == -1 ) parser.end = NULL;
- else if( n == 0 ) return NULL;
+ else if( n == 0 )
+ {
+#ifdef XTAG_DEBUG
+ printf ("empty buffer");
+#endif
+ return NULL;
+ }
else parser.end = (char *)&s[n];
+ /* can't have whitespace pcdata outside rootnode */
+ xtag_skip_whitespace( &parser );
+
tag = xtag_parse_tag( &parser );
if( !parser.valid )
{
+#ifdef XTAG_DEBUG
+ printf ("invalid file");
+#endif
xtag_free( tag );
return NULL;
}
int len, to_copy, total = 0;
va_start( ap, n );
-
+
for( s = va_arg( ap, char * ); s; s = va_arg( ap, char *) )
{
len = strlen (s);
for( l = xtag->attributes; l; l = l->next )
{
attr = (XAttribute *)l->data;
-
+
nn = xtag_snprints( buf, n, " ", attr->name, "=\"", attr->value,
"\"", NULL);
FORWARD( nn );
projects / vlc / blobdiff