Update of /cvsroot/monetdb/clients/src/mapiclient
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv1536
Modified Files:
MapiClient.mx
Log Message:
Correctly take the file name from indirection command (\<)
Index: MapiClient.mx
===================================================================
RCS file: /cvsroot/monetdb/clients/src/mapiclient/MapiClient.mx,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- MapiClient.mx 13 Aug 2007 21:18:28 -0000 1.32
+++ MapiClient.mx 14 Aug 2007 06:10:25 -0000 1.33
@@ -552,7 +552,7 @@
total = 0;
for (i = 0; i < fields; i++)
total += len[i];
- while (2 * fields + total > pagewidth && max)
+ while (2 * fields + total >= pagewidth && max)
{
max=0;
total = 0;
@@ -571,7 +571,7 @@
}
}
/* punish the long value fields */
- while (2 * fields + total > pagewidth &&
len[max] > 1)
+ while (2 * fields + total >= pagewidth &&
len[max] > 1)
{
total = 0;
max = 1;
@@ -581,7 +581,7 @@
max = i;
}
- if (2 * fields + total > pagewidth) {
+ if (2 * fields + total >= pagewidth) {
/* penalty for largest field */
total -= len[max];
len[max] *= 0.9;
@@ -652,7 +652,7 @@
ioctl(fileno(stdin), TIOCGWINSZ, &ws);
rows = ws.ws_row;
cols = ws.ws_col;
- pagewidth = cols;
+ pagewidth = cols;
#endif
}
}
@@ -1080,12 +1080,12 @@
line[--length] = 0;
if (line[length - 1] == '\r')
line[--length] = 0;
- doFile(mid, line + 1 + (mode ==
XQUERY));
+ doFile(mid, line + 2);
continue;
case '>':
/* redirect output to file */
- line++;
- length--;
+ line += 2;
+ length -= 2;
if (line[length - 1] == '\n')
line[--length] = 0;
if (line[length - 1] == '\r')
-------------------------------------------------------------------------
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
