george/fiche
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed #63

Browse Source
This commit is contained in:
solusipse
2017-10-12 01:28:35 +02:00
parent 680bb77f2c
commit 6d292a3001
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
fiche.c
View File

@@ -141,7 +141,7 @@ static int create_directory(char *output_dir, char *slug);
* @arg data Buffer with data received from the user * @arg data Buffer with data received from the user
* @arg path Path at which file containing data from the buffer will be created * @arg path Path at which file containing data from the buffer will be created
*/ */
static int save_to_file(uint8_t *data, char *output_dir, char *slug); static int save_to_file(const Fiche_Settings *s, uint8_t *data, char *slug);
// Logging-related // Logging-related
@@ -637,7 +637,7 @@ static void *handle_connection(void *args) {
// Save to file failed, we have to finish here // Save to file failed, we have to finish here
if ( save_to_file(buffer, c->settings->output_dir_path, slug) != 0 ) { if ( save_to_file(c->settings, buffer, slug) != 0 ) {
print_error("Couldn't save a file!"); print_error("Couldn't save a file!");
print_separator(); print_separator();
@@ -739,11 +739,11 @@ static int create_directory(char *output_dir, char *slug) {
} }
static int save_to_file(uint8_t *data, char *output_dir, char *slug) { static int save_to_file(const Fiche_Settings *s, uint8_t *data, char *slug) {
char *file_name = "index.txt"; char *file_name = "index.txt";
// Additional 2 bytes are for 2 slashes // Additional 2 bytes are for 2 slashes
size_t len = strlen(output_dir) + strlen(slug) + strlen(file_name) + 3; size_t len = strlen(s->output_dir_path) + strlen(slug) + strlen(file_name) + 3;
// Generate a path // Generate a path
char *path = malloc(len); char *path = malloc(len);
@@ -751,7 +751,7 @@ static int save_to_file(uint8_t *data, char *output_dir, char *slug) {
return -1; return -1;
} }
snprintf(path, len, "%s%s%s%s%s", output_dir, "/", slug, "/", file_name); snprintf(path, len, "%s%s%s%s%s", s->output_dir_path, "/", slug, "/", file_name);
// Attempt file saving // Attempt file saving
FILE *f = fopen(path, "w"); FILE *f = fopen(path, "w");
@@ -760,6 +760,14 @@ static int save_to_file(uint8_t *data, char *output_dir, char *slug) {
return -1; return -1;
} }
// Null-terminate buffer if not null terminated already
for (int i = 0; i < s->buffer_len; i++) {
if (data[i] == 0) {
break;
}
data[s->buffer_len - 1] = 0;
}
if ( fprintf(f, "%s", data) < 0 ) { if ( fprintf(f, "%s", data) < 0 ) {
fclose(f); fclose(f);
free(path); free(path);