Changeset: afe6f9ab60df for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=afe6f9ab60df
Modified Files:
Branch: default
Log Message:
Merge with Jun2010 branch.
diffs (36 lines):
diff -r 9f5a02f26b86 -r afe6f9ab60df clients/ChangeLog.Jun2010
--- a/clients/ChangeLog.Jun2010 Tue Jul 20 17:31:48 2010 +0200
+++ b/clients/ChangeLog.Jun2010 Tue Jul 20 17:54:06 2010 +0200
@@ -1,3 +1,7 @@
# ChangeLog file for clients
# This file is updated with Maddlog
+* Tue Jul 20 2010 Sjoerd Mullender <sjo...@acm.org>
+- In case of an incomplete line from the server, add a newline.
+ This fixes bug 2619.
+
diff -r 9f5a02f26b86 -r afe6f9ab60df clients/src/mapilib/Mapi.mx
--- a/clients/src/mapilib/Mapi.mx Tue Jul 20 17:31:48 2010 +0200
+++ b/clients/src/mapilib/Mapi.mx Tue Jul 20 17:54:06 2010 +0200
@@ -3541,13 +3541,18 @@
printf("got next block: length:" SSZFMT "\n", len);
printf("text:%s\n", mid->blk.buf + mid->blk.end);
}
- if (!len) { /* add prompt */
+ if (len == 0) { /* add prompt */
+ if (mid->blk.end > mid->blk.nxt) {
+ /* add fake newline since newline was
+ * missing from server */
+ nl = mid->blk.buf + mid->blk.end;
+ *nl = '\n';
+ mid->blk.end++;
+ }
len = 2;
mid->blk.buf[mid->blk.end] = PROMPTBEG;
mid->blk.buf[mid->blk.end + 1] = '\n';
mid->blk.buf[mid->blk.end + 2] = 0;
- if (!nl)
- nl = mid->blk.buf + mid->blk.end + 1;
}
mid->blk.end += (int) len;
}
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
