Changeset: e8e20440cbf0 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e8e20440cbf0
Modified Files:
debian/libpf-ferry0.install
Branch: default
Log Message:
Merge with Aug2011 branch.
diffs (52 lines):
diff --git a/clients/mapiclient/mnc.c b/clients/mapiclient/mnc.c
--- a/clients/mapiclient/mnc.c
+++ b/clients/mapiclient/mnc.c
@@ -98,6 +98,8 @@
char buf[8096];
size_t len;
fd_set fds;
+ char seeneof = 0;
+ char seenflush = 0;
static struct option long_options[8] = {
{ "listen", 0, 0, 'l' },
@@ -269,16 +271,30 @@
if ((len = mnstr_read(in, buf, 1, sizeof(buf))) != 0) {
if (!write(1, buf, len))
exit(2);
+ seenflush = 0;
} else {
- /* EOF */
- break;
+ /* flush or error */
+ if (!seenflush) {
+ seenflush = 1;
+ } else {
+ break;
+ }
}
}
if (FD_ISSET(0, &fds)) {
if ((len = read(0, buf, sizeof(buf))) != 0) {
mnstr_write(out, buf, len, 1);
+ seeneof = 0;
+ } else if (len == 0) {
+ /* EOF */
+ if (!seeneof) {
+ mnstr_flush(out);
+ seeneof = 1;
+ } else {
+ break;
+ }
} else {
- /* EOF */
+ /* error */
break;
}
}
diff --git a/debian/libpf-ferry0.install b/debian/libpf-ferry0.install
deleted file mode 100644
--- a/debian/libpf-ferry0.install
+++ /dev/null
@@ -1,1 +0,0 @@
-debian/tmp/usr/lib/libpf_ferry.so.* usr/lib
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
