Update of /cvsroot/monetdb/MonetDB5/src/mal
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv23675/src/mal
Modified Files:
Tag: MonetDB_5-2
mal_client.mx
Log Message:
only handle partial lines once.
Index: mal_client.mx
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/mal/mal_client.mx,v
retrieving revision 1.158
retrieving revision 1.158.2.1
diff -u -d -r1.158 -r1.158.2.1
--- mal_client.mx 11 Sep 2007 21:56:40 -0000 1.158
+++ mal_client.mx 28 Sep 2007 20:20:39 -0000 1.158.2.1
@@ -772,23 +772,23 @@
}
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;
+ } else {
+ in->pos++;
+ }
+ 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: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Monetdb-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins
