--- psiconv/trunk/program/psiconv/gen_html4.c 1999/12/02 17:18:55 34 +++ psiconv/trunk/program/psiconv/gen_html4.c 2000/12/10 16:49:40 58 @@ -23,8 +23,8 @@ #include #include #include -#include "data.h" -#include "list.h" +#include "psiconv/data.h" +#include "psiconv/list.h" #include "gen.h" #include "psiconv.h" @@ -447,9 +447,10 @@ fputs("}\n", of); } -static int psiconv_gen_html4(FILE * of, const psiconv_file file, +static int psiconv_gen_html4(const char *filename, const psiconv_file file, const char *dest) { + FILE * of; int i; psiconv_paragraph para; psiconv_word_style normal, sty; @@ -459,9 +460,12 @@ wf = file->file; else { /* Fall back on the normal HTML generator */ - return psiconv_gen_html(of,file,dest); + return psiconv_gen_html(filename,file,dest); } + if (! (of = fopen(filename,"w"))) + return -1; + fputs("", of); fputs("\n\n\n \n", of); @@ -491,10 +495,11 @@ fput_para(of, para, wf); } fputs("\n\n", of); - return 0; + + return fclose(of); } -static struct psiconv_fileformat ff = +static struct psiconv_fileformat_s ff = { "HTML4", "HTML 4.0 with cascading style sheets",