database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-06-14 18:42:34 +03:00
Code Activity

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

Browse Source 
This is an astonishingly ancient bit of silliness, dating AFAICS to
commit edb519b14 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
This commit is contained in:
Tom Lane
2018-12-07 13:11:30 -05:00
parent 5deadfef28
commit b90e6cef12
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/interfaces/libpq/fe-print.c
View File

@ -304,6 +304,8 @@ PQprint(FILE *fout, const PGresult *res, const PQprintOpt *po)
if (po->header && !po->html3) if (po->header && !po->html3)
fprintf(fout, "(%d row%s)\n\n", PQntuples(res), fprintf(fout, "(%d row%s)\n\n", PQntuples(res),
(PQntuples(res) == 1) ? "" : "s"); (PQntuples(res) == 1) ? "" : "s");
if (po->html3 && !po->expanded)
fputs("</table>\n", fout);
free(fieldMax); free(fieldMax);
free(fieldNotNum); free(fieldNotNum);
free((void *) fieldNames); free((void *) fieldNames);
@ -323,8 +325,6 @@ PQprint(FILE *fout, const PGresult *res, const PQprintOpt *po)
#endif /* ENABLE_THREAD_SAFETY */ #endif /* ENABLE_THREAD_SAFETY */
#endif /* WIN32 */ #endif /* WIN32 */
} }
if (po->html3 && !po->expanded)
fputs("</table>\n", fout);
} }
} }