Update of /cvsroot/monetdb/MonetDB5/src/mal
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv4318/src/mal
Modified Files:
mal_client.mx
Log Message:
propagated changes of Friday Sep 28 2007 - Wednesday Oct 03 2007
from the MonetDB_5-2 branch to the development trunk
Index: mal_client.mx
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/mal/mal_client.mx,v
retrieving revision 1.158
retrieving revision 1.159
diff -u -d -r1.158 -r1.159
--- mal_client.mx 11 Sep 2007 21:56:40 -0000 1.158
+++ mal_client.mx 3 Oct 2007 14:00:46 -0000 1.159
@@ -772,23 +772,20 @@
}
while ((rd = bstream_next(in)) > 0 && !in->eof) {
sum += rd;
- if (!in->mode) {/* read one line at a time in line mode
*/
+ if (!in->mode) /* read one line at a time in line mode
*/
break;
- } else { /* find last new line */
- char *p = in->buf+in->len-1;
+ }
+ if (in->mode) { /* find last new line */
+ char *p = in->buf+in->len-1;
- while(p > in->buf && *p != '\n') {
- *(p+1) = *p;
- p--;
- }
- if (p > in->buf) {
- *(p+1) = 0;
- } else {
- in->pos++;
- }
- if (p != in->buf+ in->len -1)
- in->len++;
+ while(p > in->buf && *p != '\n') {
+ *(p+1) = *p;
+ p--;
}
+ if (p > in->buf)
+ *(p+1) = 0;
+ if (p != in->buf + in->len -1)
+ in->len++;
}
if (sum == 0 && in->eof && isa_block_stream(in->s)) {
/* we hadn't seen the EOF before, so just try again
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Monetdb-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins
