Remove setvbuf() call from PQtrace()

alvherre · alvherre · commit 6ec578e60101 · 2021-03-31T20:11:51.000-03:00
It's misplaced there -- it's not libpq's output stream to tweak in that way. In particular, POSIX says that it has to be called before any other operation on the file, so if a stream previously used by the calling application, bad things may happen. Put setvbuf() in libpq_pipeline for good measure. Also, reduce fopen(..., "w+") to just fopen(..., "w") in libpq_pipeline.c. It's not clear that this fixes anything, but we don't use w+ anywhere. Per complaints from Tom Lane. Discussion: https://postgr.es/m/3337422.1617229905@sss.pgh.pa.us
diff --git a/src/interfaces/libpq/fe-trace.c b/src/interfaces/libpq/fe-trace.c
@@ -40,8 +40,6 @@ PQtrace(PGconn *conn, FILE *debug_port)
 	if (debug_port == NULL)
 		return;
 
-	/* Make the trace stream line-buffered */
-	setvbuf(debug_port, NULL, _IOLBF, 0);
 	conn->Pfdebug = debug_port;
 	conn->traceFlags = 0;
 }
diff --git a/src/test/modules/libpq_pipeline/libpq_pipeline.c b/src/test/modules/libpq_pipeline/libpq_pipeline.c
@@ -1319,10 +1319,13 @@ main(int argc, char **argv)
 	/* Set the trace file, if requested */
 	if (tracefile != NULL)
 	{
-		trace = fopen(tracefile, "w+");
-
+		trace = fopen(tracefile, "w");
 		if (trace == NULL)
 			pg_fatal("could not open file \"%s\": %m", tracefile);
+
+		/* Make it line-buffered */
+		setvbuf(trace, NULL, _IOLBF, 0);
+
 		PQtrace(conn, trace);
 		PQtraceSetFlags(conn,
 						PQTRACE_SUPPRESS_TIMESTAMPS | PQTRACE_REGRESS_MODE);

Original file line number	Diff line number	Diff line change
`@@ -40,8 +40,6 @@ PQtrace(PGconn conn, FILE debug_port)`
`40`	`40`	`if (debug_port == NULL)`
`41`	`41`	`return;`
`42`	`42`
`43`		`- /* Make the trace stream line-buffered */`
`44`		`- setvbuf(debug_port, NULL, _IOLBF, 0);`
`45`	`43`	`conn->Pfdebug = debug_port;`
`46`	`44`	`conn->traceFlags = 0;`
`47`	`45`	`}`