Update of /cvsroot/monetdb/MonetDB5/src/tools
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv29795
Modified Files:
merovingian.mx
Log Message:
Misc fixes related to not detecting msglog and errlog point to the same
file.
Index: merovingian.mx
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/tools/merovingian.mx,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- merovingian.mx 29 Aug 2007 09:47:28 -0000 1.33
+++ merovingian.mx 31 Aug 2007 14:45:25 -0000 1.34
@@ -174,7 +174,8 @@
w = w->next;
}
fflush(fout);
- fflush(ferr);
+ if (equalouterr == 0)
+ fflush(ferr);
/* see if we need to break the loop */
if (_keepLogging == 0) {
if (hadData == 0) {
@@ -1022,7 +1023,6 @@
}
q->dbname = "file";
}
- free(msglog);
/* where should our err output go to? */
if (errlog == NULL) {
@@ -1043,6 +1043,7 @@
}
q->dbname = "file";
}
+ free(msglog);
free(errlog);
d = q->next = alloca(sizeof(struct _dpair));
@@ -1179,7 +1180,8 @@
}
fclose(q->fout);
- fclose(q->ferr);
+ if (q->fout != q->ferr)
+ fclose(q->ferr);
/* clean up dbpair structs */
while (d != NULL) {
-------------------------------------------------------------------------
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
