In PQprint(), write HTML table trailer before closing the output pipe.

tglsfdc · tglsfdc · commit b90e6cef1266 · 2018-12-07T13:11:30.000-05:00
This is an astonishingly ancient bit of silliness, dating AFAICS to commit edb519b of 27-Jul-1996 which added the pipe close stanza in the wrong place. It happens to be harmless given that the code above this won't enable the pager if html3 output mode is selected. Still, somebody might try to relax that restriction someday, and in any case it could confuse readers and static analysis tools, so let's fix it in HEAD. Per bug #15541 from Pan Bian. Discussion: https://postgr.es/m/15541-c835d8b9a903f7ad@postgresql.org
diff --git a/src/interfaces/libpq/fe-print.c b/src/interfaces/libpq/fe-print.c
@@ -304,6 +304,8 @@ PQprint(FILE *fout, const PGresult *res, const PQprintOpt *po)
 		if (po->header && !po->html3)
 			fprintf(fout, "(%d row%s)\n\n", PQntuples(res),
 					(PQntuples(res) == 1) ? "" : "s");
+		if (po->html3 && !po->expanded)
+			fputs("</table>\n", fout);
 		free(fieldMax);
 		free(fieldNotNum);
 		free((void *) fieldNames);
@@ -323,8 +325,6 @@ PQprint(FILE *fout, const PGresult *res, const PQprintOpt *po)
 #endif							/* ENABLE_THREAD_SAFETY */
 #endif							/* WIN32 */
 		}
-		if (po->html3 && !po->expanded)
-			fputs("</table>\n", fout);
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -304,6 +304,8 @@ PQprint(FILE fout, const PGresult res, const PQprintOpt *po)`
`304`	`304`	`if (po->header && !po->html3)`
`305`	`305`	`fprintf(fout, "(%d row%s)\n\n", PQntuples(res),`
`306`	`306`	`(PQntuples(res) == 1) ? "" : "s");`
	`307`	`+ if (po->html3 && !po->expanded)`
	`308`	`+ fputs("</table>\n", fout);`
`307`	`309`	`free(fieldMax);`
`308`	`310`	`free(fieldNotNum);`
`309`	`311`	`free((void *) fieldNames);`
`@@ -323,8 +325,6 @@ PQprint(FILE fout, const PGresult res, const PQprintOpt *po)`
`323`	`325`	`#endif /* ENABLE_THREAD_SAFETY */`
`324`	`326`	`#endif /* WIN32 */`
`325`	`327`	`}`
`326`		`- if (po->html3 && !po->expanded)`
`327`		`- fputs("</table>\n", fout);`
`328`	`328`	`}`
`329`	`329`	`}`
`330`	`330`