m/grafX2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix generatedoc.c

Browse Source
This commit is contained in:
Thomas Bernard 2020-04-19 18:40:19 +02:00
parent 00323b1942
commit 47485a343e
No known key found for this signature in database
GPG Key ID: 0FF11B67A5C0863C
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/generatedoc.c
View File

@ -27,6 +27,7 @@
* @file generatedoc.c * @file generatedoc.c
* HTML doc generator * HTML doc generator
*/ */
#include <stdlib.h>
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
@ -232,7 +233,7 @@ static const char * Export_help_table(FILE * f, unsigned int page)
if (table[index].Line_type == 'K') if (table[index].Line_type == 'K')
{ {
char keytmp[64]; char keytmp[90];
snprintf(keytmp, sizeof(keytmp), "<em>%s</em>", Keyboard_default_shortcut(table[index].Line_parameter)); snprintf(keytmp, sizeof(keytmp), "<em>%s</em>", Keyboard_default_shortcut(table[index].Line_parameter));
fprintf(f, table[index].Text, keytmp); fprintf(f, table[index].Text, keytmp);
} }
@ -324,15 +325,24 @@ static int Export_help(const char * path)
{ {
FILE * f; FILE * f;
FILE * findex; FILE * findex;
char filename[MAX_PATH_CHARACTERS]; char * filename;
size_t filename_size;
unsigned int i; unsigned int i;
snprintf(filename, sizeof(filename), "%s/index.html", path); filename_size = strlen(path) + 64;
filename = malloc(filename_size);
if (filename == NULL)
{
fprintf(stderr, "Failed to allocate %lu bytes\n", (unsigned long)filename_size);
return -1;
}
snprintf(filename, filename_size, "%s/index.html", path);
//GFX2_Log(GFX2_INFO, "Creating %s\n", filename); //GFX2_Log(GFX2_INFO, "Creating %s\n", filename);
findex = fopen(filename, "w"); findex = fopen(filename, "w");
if (findex == NULL) if (findex == NULL)
{ {
fprintf(stderr, "Cannot save index HTML file %s\n", filename); fprintf(stderr, "Cannot save index HTML file %s\n", filename);
free(filename);
return -1; return -1;
} }
fprintf(findex, "<!DOCTYPE html>\n"); fprintf(findex, "<!DOCTYPE html>\n");
@ -364,12 +374,13 @@ static int Export_help(const char * path)
for (i = 0; i < sizeof(Help_section)/sizeof(Help_section[0]); i++) for (i = 0; i < sizeof(Help_section)/sizeof(Help_section[0]); i++)
{ {
const char * title; const char * title;
snprintf(filename, sizeof(filename), "%s/grafx2_%02d.html", path, i); snprintf(filename, filename_size, "%s/grafx2_%02d.html", path, i);
f = fopen(filename, "w"); f = fopen(filename, "w");
if (f == NULL) if (f == NULL)
{ {
fprintf(stderr, "Cannot save HTML file %s\n", filename); fprintf(stderr, "Cannot save HTML file %s\n", filename);
fclose(findex); fclose(findex);
free(filename);
return -1; return -1;
} }
//GFX2_Log(GFX2_INFO, "Saving %s\n", filename); //GFX2_Log(GFX2_INFO, "Saving %s\n", filename);
@ -390,7 +401,7 @@ static int Export_help(const char * path)
fprintf(findex, "</body>\n"); fprintf(findex, "</body>\n");
fclose(findex); fclose(findex);
snprintf(filename, sizeof(filename), "%s/grafx2.css", path); snprintf(filename, filename_size, "%s/grafx2.css", path);
f = fopen(filename, "w"); f = fopen(filename, "w");
if (f != NULL) if (f != NULL)
{ {
@ -435,7 +446,7 @@ static int Export_help(const char * path)
fclose(f); fclose(f);
} }
snprintf(filename, sizeof(filename), "%s/grafx2.js", path); snprintf(filename, filename_size, "%s/grafx2.js", path);
f = fopen(filename, "w"); f = fopen(filename, "w");
if (f != NULL) if (f != NULL)
{ {
@ -470,5 +481,6 @@ static int Export_help(const char * path)
"}\n"); "}\n");
fclose(f); fclose(f);
} }
free(filename);
return 0; return 0;
} }