lib/libhttp
1
0
Fork 0
mirror of https://github.com/lammertb/libhttp.git synced 2025-09-05 23:44:00 +03:00
Code Activity

Handle options of main.c in a similar way as options of civetweb.c

Browse Source
This commit is contained in:
bel
2014-03-07 20:35:18 +01:00
parent e9e9ff3fa9
commit 5cfe727d2b
1 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/main.c
View File

@@ -91,6 +91,18 @@ static struct mg_context *ctx; /* Set by start_civetweb() */
#define CONFIG_FILE2 "/usr/local/etc/civetweb.conf" #define CONFIG_FILE2 "/usr/local/etc/civetweb.conf"
#endif #endif
enum {
OPTION_TITLE,
OPTION_ICON,
NUM_MAIN_OPTIONS
};
static struct mg_option main_config_options[] = {
{"title", CONFIG_TYPE_STRING, NULL},
{"icon", CONFIG_TYPE_STRING, NULL},
{NULL, CONFIG_TYPE_UNKNOWN, NULL}
};
static void WINCDECL signal_handler(int sig_num) static void WINCDECL signal_handler(int sig_num)
{ {
exit_flag = sig_num; exit_flag = sig_num;
@@ -203,10 +215,12 @@ static int set_option(char **options, const char *name, const char *value)
int i, type; int i, type;
const struct mg_option *default_options = mg_get_valid_options(); const struct mg_option *default_options = mg_get_valid_options();
if (0==strcmp(name, "title")) { for (i = 0; main_config_options[i].name != 0; i++) {
if (0==strcmp(name, main_config_options[OPTION_TITLE].name)) {
/* This option is evaluated by main.c, not civetweb.c - just skip it and return OK */ /* This option is evaluated by main.c, not civetweb.c - just skip it and return OK */
return 1; return 1;
} }
}
type = CONFIG_TYPE_UNKNOWN; type = CONFIG_TYPE_UNKNOWN;
for (i = 0; default_options[i].name != 0; i++) { for (i = 0; default_options[i].name != 0; i++) {
@@ -367,13 +381,14 @@ static void process_command_line_arguments(char *argv[], char **options)
static void init_server_name(int argc, const char *argv[]) static void init_server_name(int argc, const char *argv[])
{ {
int i; int i;
assert(sizeof(main_config_options)/sizeof(main_config_options[0]) == NUM_MAIN_OPTIONS+1);
assert((strlen(mg_version())+12)<sizeof(server_base_name)); assert((strlen(mg_version())+12)<sizeof(server_base_name));
snprintf(server_base_name, sizeof(server_base_name), "Civetweb V%s", snprintf(server_base_name, sizeof(server_base_name), "Civetweb V%s",
mg_version()); mg_version());
server_name = server_base_name; server_name = server_base_name;
for (i=0; i<argc-1; i++) { for (i=0; i<argc-1; i++) {
if (0==strcmp(argv[i], "-title")) { if ((argv[i][0]=='-') && (0==strcmp(argv[i]+1, main_config_options[OPTION_TITLE].name))) {
server_name = (char*)(argv[i+1]); server_name = (char*)(argv[i+1]);
} }
} }