From 37fb9ef76174a83e27dd27a3250f4be5542e7452 Mon Sep 17 00:00:00 2001 From: Christian Heller Date: Sat, 25 Jan 2014 22:18:38 +0100 Subject: [PATCH] Made sure client is not confused by newlines at the end of config files. --- src/client/command_db.c | 29 ++++++++++++++++++----------- src/client/windows.c | 2 +- src/client/windows.h | 4 ++++ 3 files changed, 23 insertions(+), 12 deletions(-) diff --git a/src/client/command_db.c b/src/client/command_db.c index a74a93b..27a3b6d 100644 --- a/src/client/command_db.c +++ b/src/client/command_db.c @@ -60,7 +60,6 @@ extern void init_command_db() uint32_t lines; uint32_t linemax = textfile_sizes(file, &lines); char line[linemax + 1]; - world.commandDB.cmds = try_malloc(lines * sizeof(struct Command), f_name); uint8_t i = 0; char * delim = " "; while (try_fgets(line, linemax + 1, file, f_name)) @@ -69,20 +68,28 @@ extern void init_command_db() { break; } - copy_tokenized_string(line, &world.commandDB.cmds[i].dsc_short, delim); - copy_tokenized_string(NULL, &world.commandDB.cmds[i].server_msg, delim); - if (!strcmp("0", world.commandDB.cmds[i].server_msg)) - { /*.server_msg==0 detects*/ - free(world.commandDB.cmds[i].server_msg); /* non-server commands */ - world.commandDB.cmds[i].server_msg = NULL;/* in try_key() / */ - } /* try_server_command().*/ + struct Command cmd; + copy_tokenized_string(line, &cmd.dsc_short, delim); + copy_tokenized_string(NULL, &cmd.server_msg, delim); + if (!strcmp("0", cmd.server_msg)) + { /* A .server_msg == NULL helps control.c's */ + free(cmd.server_msg); /* try_key() and try_server_command() to */ + cmd.server_msg = NULL; /* differentiate server commands from */ + } /* non-server commands. */ char * arg_string = strtok(NULL, delim); - world.commandDB.cmds[i].arg = arg_string[0]; - copy_tokenized_string(NULL, &world.commandDB.cmds[i].dsc_long, "\n"); + cmd.arg = arg_string[0]; + copy_tokenized_string(NULL, &cmd.dsc_long, "\n"); + uint32_t old_size = i * sizeof(struct Command); + uint32_t new_size = old_size + sizeof(struct Command); + struct Command * new_cmds = try_malloc(new_size, f_name); + memcpy(new_cmds, world.commandDB.cmds, old_size); + new_cmds[i] = cmd; + free(world.commandDB.cmds); + world.commandDB.cmds = new_cmds; i++; } try_fclose(file, f_name); - world.commandDB.n = lines; + world.commandDB.n = i; set_cleanup_flag(CLEANUP_COMMANDS); } diff --git a/src/client/windows.c b/src/client/windows.c index e5c691d..2fd5131 100644 --- a/src/client/windows.c +++ b/src/client/windows.c @@ -625,7 +625,7 @@ extern uint8_t read_winconf_from_file(char * line, uint32_t linemax, { char * f_name = "read_winconf_from_file()"; int test = try_fgetc(file, f_name); - if (EOF == test) + if (EOF == test || '\n' == test) { return 0; } diff --git a/src/client/windows.h b/src/client/windows.h index 59cf64d..97da5f1 100644 --- a/src/client/windows.h +++ b/src/client/windows.h @@ -73,6 +73,10 @@ extern struct Win * get_win_by_id(char id); /* Read/write individual Win (identified by "c") and world.winDB.order / * world.winDB.active from/to "file". Follow writing with "delim" delimiter. * Use "line" and "linemax" as expected by try_fgets(). + * + * Note that read_winconf_from_file() returns 1 on success and 0 if it detects + * having found the end of the valid interface configuration file by either + * hitting a EOF or a newline (so empty newlines at the end of the file are ok). */ extern uint8_t read_winconf_from_file(char * line, uint32_t linemax, FILE * file); -- 2.30.2