X-Git-Url: https://code.citadel.org/?p=citadel.git;a=blobdiff_plain;f=citadel%2Fmodules%2Fmigrate%2Fserv_migrate.c;fp=citadel%2Fmodules%2Fmigrate%2Fserv_migrate.c;h=6c11dc6870886d531e8743962dcfca4196bc830a;hp=f6fd819cec52bd951819722a273d5975773e599b;hb=819d891a2f2232e8eb6f9bad895c79a715fa3dd6;hpb=58d2b25adf564c6f71f20e9a44543ce04482e57d

diff --git a/citadel/modules/migrate/serv_migrate.c b/citadel/modules/migrate/serv_migrate.c
index f6fd819ce..6c11dc687 100644
--- a/citadel/modules/migrate/serv_migrate.c
+++ b/citadel/modules/migrate/serv_migrate.c
@@ -891,7 +891,7 @@ void migr_xml_end(void *data, const char *el) {
 void migr_do_import(void) {
 	StrBuf *Buf;
 	XML_Parser xp;
-	int linelen;
+	int Finished = 0;
 	
 	unbuffer_output();
 	Buf = NewStrBufPlain(NULL, SIZ);
@@ -908,17 +908,23 @@ void migr_do_import(void) {
 	cprintf("%d sock it to me\n", SEND_LISTING);
 	unbuffer_output();
 
-	while (CtdlClientGetLine(Buf) >= 0 && strcmp(ChrPtr(Buf), "000")) {
-		linelen = StrLength(Buf);
-		StrBufAppendBufPlain(Buf, HKEY("\n"), 0);
+	client_set_inbound_buf(SIZ * 10);
 
+	while (!Finished && client_read_random_blob(Buf, -1) >= 0) {
+		if ((StrLength(Buf) > 4) &&
+		    !strcmp(ChrPtr(Buf) + StrLength(Buf) - 4, "000\n"))
+		{
+			Finished = 1;
+			StrBufCutAt(Buf, StrLength(Buf) - 4, NULL);
+		}
 		if (server_shutting_down)
 			break;	// Should we break or return?
 		
-		if (linelen == 0)
+		if (StrLength(Buf) == 0)
 			continue;
 
-		XML_Parse(xp, ChrPtr(Buf), linelen, 0);
+		XML_Parse(xp, ChrPtr(Buf), StrLength(Buf), 0);
+		FlushStrBuf(Buf);
 	}
 
 	XML_Parse(xp, "", 0, 1);