b04a39a028980ea32b2ac62950bdff0a67de16d0
galt
Wed Jul 18 14:48:19 2018 -0700
Add missing CSP header to pages not handled automatically by library functions. refs #21729.
diff --git src/tabFile/tabToHtml/tabToHtml.c src/tabFile/tabToHtml/tabToHtml.c
index 5c3bed1..ccd217b 100644
--- src/tabFile/tabToHtml/tabToHtml.c
+++ src/tabFile/tabToHtml/tabToHtml.c
@@ -1,20 +1,21 @@
/* tabToHtml - Convert tab-separated-file to an HTML file that is a table and not much else.. */
#include "common.h"
#include "linefile.h"
#include "hash.h"
#include "options.h"
+#include "htmshell.h"
#include "fieldedTable.h"
char *clTitle = NULL; // Title from command line
boolean clEmbed; // If true we embed in another page
void usage()
/* Explain usage and exit. */
{
errAbort(
"tabToHtml - Convert tab-separated-file to an HTML file that is a table and not much else.\n"
"usage:\n"
" tabToHtml in.tsv out.html\n"
"options:\n"
" -embed - don't write beginning and end of page, just controls and tree.\n"
@@ -23,36 +24,37 @@
);
}
/* Command line validation table. */
static struct optionSpec options[] = {
{"embed", OPTION_BOOLEAN},
{"title", OPTION_STRING},
{NULL, 0},
};
void writeHtml(struct fieldedTable *table, FILE *f)
/* Write HTML version of table */
{
if (!clEmbed)
{
- fputs(
+ fprintf(f,
"\n"
"\n"
"\n"
+ "%s"
" \n"
- , f);
+ , getCspMetaHeader());
if (clTitle)
fprintf(f, " %s\n", clTitle);
else
fprintf(f, " table %s\n", table->name);
fputs(
"\n"
"\n"
, f);
fprintf(f,
"");
if (clTitle)