X-Git-Url: http://git.cinelerra-gg.org/git/?p=goodguy%2Fhistory.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Ffilexml.C;fp=cinelerra-5.1%2Fcinelerra%2Ffilexml.C;h=8914ff4498b29412500936913104e40740fd8aee;hp=f474317853562554b3a36b9429adc3352ff90bc3;hb=b2eb290b3f6e5c233393017aa152e67c76243130;hpb=c0fe374d9f9ab1653e9cc2edb41afb076eeae69f

diff --git a/cinelerra-5.1/cinelerra/filexml.C b/cinelerra-5.1/cinelerra/filexml.C
index f4743178..8914ff44 100644
--- a/cinelerra-5.1/cinelerra/filexml.C
+++ b/cinelerra-5.1/cinelerra/filexml.C
@@ -109,6 +109,19 @@ int XMLBuffer::read(char *bp, int len)
 	return len;
 }
 
+void XMLBuffer::copy_from(XMLBuffer *xbuf)
+{
+	if( bsz != xbuf->bsz ) { delete [] bfr;  bfr = 0; }
+	if( !bfr ) bfr = new unsigned char[bsz = xbuf->bsz];
+	lmt = bfr + bsz;
+	long ilen = xbuf->otell(), olen = xbuf->itell();
+	inp = pos(ilen);
+	outp = pos(olen);
+	if( ilen > 0 )
+		memmove(bfr, xbuf->bfr, ilen);
+	destroy = xbuf->destroy;
+}
+
 
 // Precision in base 10
 // for float is 6 significant figures
@@ -363,11 +376,12 @@ FileXML::FileXML(int coded)
 	output_length = 0;
 	buffer = new XMLBuffer();
 	set_coding(coded);
+	shared = 0;
 }
 
 FileXML::~FileXML()
 {
-	delete buffer;
+	if( !shared ) delete buffer;
 	delete [] output;
 }
 
@@ -440,7 +454,7 @@ char* FileXML::get_data()
 }
 char* FileXML::string()
 {
-	return (char *)buffer->str();
+	return (char *)buffer->cstr();
 }
 
 long FileXML::length()
@@ -494,30 +508,29 @@ int FileXML::skip_tag()
 	return 1;
 }
 
-int FileXML::read_data_until(const char *tag_end, char *out, int len, int skip)
+int FileXML::read_data_until(const char *tag_end, XMLBuffer *xbuf, int skip)
 {
 	long ipos = buffer->itell();
-	int opos = 0, pos = -1;
-	int ch = buffer->next();
-	for( int olen=len-1; ch>=0 && opos<olen; ch=buffer->next() ) {
+	int pos = -1;
+	for( int ch=buffer->next(); ch>=0; ch=buffer->next() ) {
 		if( pos < 0 ) { // looking for next tag
 			if( ch == left_delm ) {
 				ipos = buffer->itell()-1;
 				pos = 0;
 			}
 			else
-				out[opos++] = ch;
+				xbuf->next(ch);
 			continue;
 		}
 		// check for end of match
 		if( !tag_end[pos] && ch == right_delm ) break;
 		// if mismatched, copy prefix to out
 		if( tag_end[pos] != ch ) {
-			out[opos++] = left_delm;
-			for( int i=0; i<pos && opos<olen; ++i )
-				out[opos++] = tag_end[i];
-			if( opos < olen ) out[opos++] = ch;
+			xbuf->next(left_delm);
+			for( int i=0; i<pos; ++i )
+				xbuf->next(tag_end[i]);
 			pos = -1;
+			xbuf->next(ch);
 			continue;
 		}
 		++pos;
@@ -525,14 +538,14 @@ int FileXML::read_data_until(const char *tag_end, char *out, int len, int skip)
 // if end tag is reached, pos is left on the < of the end tag
 	if( !skip && pos >= 0 && !tag_end[pos] )
 		buffer->iseek(ipos);
-	return opos;
+	return xbuf->otell();
 }
 
-int FileXML::read_text_until(const char *tag_end, char *out, int len, int skip)
+int FileXML::read_text_until(const char *tag_end, XMLBuffer *xbuf, int skip)
 {
-	char data[len+1];
-	int opos = read_data_until(tag_end, data, len, skip);
-	decode(out, data, opos);
+	int len = read_data_until(tag_end, xbuf, skip);
+	char *cp = xbuf->cstr();
+	decode(cp, cp, len);
 	return 0;
 }
 
@@ -615,30 +628,31 @@ int FileXML::get_coding()
 	return coded;
 }
 
-int FileXML::set_shared_input(char *shared_string, long avail, int coded)
+int FileXML::set_shared_input(XMLBuffer *xbuf)
 {
 	strcpy(this->filename, "");
 	delete buffer;
-	buffer = new XMLBuffer(shared_string, avail, 0);
+	buffer = xbuf;
+	xbuf->iseek(0);
 	set_coding(coded);
-        return 0;
+	shared = 1;
+	return 0;
 }
 
-int FileXML::set_shared_output(char *shared_string, long avail, int coded)
+int FileXML::set_shared_output(XMLBuffer *xbuf)
 {
 	strcpy(this->filename, "");
 	delete buffer;
-	buffer = new XMLBuffer(avail, shared_string, 0);
+	buffer = xbuf;
+	xbuf->oseek(0);
 	set_coding(coded);
-        return 0;
+	shared = 1;
+	return 0;
 }
 
 
-
 // ================================ XML tag
 
-
-
 int XMLTag::title_is(const char *tp)
 {
 	return !strcasecmp(title, tp) ? 1 : 0;
@@ -751,7 +765,8 @@ long XMLBuffer::encoded_length(const char *sp, int n)
 char *XMLBuffer::copy_data(char *bp, const char *sp, int n)
 {
 	int len = n < 0 ? strlen(sp) : n;
-	memmove(bp,sp,len);
+	if( bp != sp )
+		memmove(bp,sp,len);
 	bp[len] = 0;
 	return bp;
 }