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

Add version to the settings menu title, change management of the server_name variable, and add some assert to check buffer sizes

Browse Source
This commit is contained in:
bel
2014-03-07 18:28:28 +01:00
parent 492d3f567d
commit 78b4a45886
1 changed files with 26 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/main.c
View File

@@ -39,6 +39,7 @@
#include <stddef.h> #include <stddef.h>
#include <stdarg.h> #include <stdarg.h>
#include <ctype.h> #include <ctype.h>
#include <assert.h>
#include "civetweb.h" #include "civetweb.h"
@@ -76,10 +77,10 @@ extern char *_getcwd(char *buf, size_t size);
#define MAX_CONF_FILE_LINE_SIZE (8 * 1024) #define MAX_CONF_FILE_LINE_SIZE (8 * 1024)
static int exit_flag; static int exit_flag;
static char server_name[40]; /* Set by init_server_name() */ static char server_base_name[40]; /* Set by init_server_name() */
static char config_file[PATH_MAX] = ""; /* Set by static char *server_name; /* Set by init_server_name() */
process_command_line_arguments() */ static char config_file[PATH_MAX] = ""; /* Set by process_command_line_arguments() */
static struct mg_context *ctx; /* Set by start_civetweb() */ static struct mg_context *ctx; /* Set by start_civetweb() */
#if !defined(CONFIG_FILE) #if !defined(CONFIG_FILE)
#define CONFIG_FILE "civetweb.conf" #define CONFIG_FILE "civetweb.conf"
@@ -360,8 +361,10 @@ static void process_command_line_arguments(char *argv[], char **options)
static void init_server_name(void) static void init_server_name(void)
{ {
snprintf(server_name, sizeof(server_name), "Civetweb v%s", assert((strlen(mg_version())+12)<sizeof(server_base_name));
snprintf(server_base_name, sizeof(server_base_name), "Civetweb V%s",
mg_version()); mg_version());
server_name = server_base_name;
} }
static int log_message(const struct mg_connection *conn, const char *message) static int log_message(const struct mg_connection *conn, const char *message)
@@ -619,6 +622,7 @@ static BOOL CALLBACK DlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lP)
const char *name, *value; const char *name, *value;
const struct mg_option *default_options = mg_get_valid_options(); const struct mg_option *default_options = mg_get_valid_options();
char *file_options[MAX_OPTIONS] = {0}; char *file_options[MAX_OPTIONS] = {0};
char *title;
switch (msg) { switch (msg) {
case WM_CLOSE: case WM_CLOSE:
@@ -727,7 +731,13 @@ static BOOL CALLBACK DlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lP)
case WM_INITDIALOG: case WM_INITDIALOG:
SendMessage(hDlg, WM_SETICON,(WPARAM) ICON_SMALL, (LPARAM) hIcon); SendMessage(hDlg, WM_SETICON,(WPARAM) ICON_SMALL, (LPARAM) hIcon);
SendMessage(hDlg, WM_SETICON,(WPARAM) ICON_BIG, (LPARAM) hIcon); SendMessage(hDlg, WM_SETICON,(WPARAM) ICON_BIG, (LPARAM) hIcon);
SetWindowText(hDlg, "Civetweb settings"); title = malloc(strlen(server_name)+16);
if (title) {
strcpy(title, server_name);
strcat(title, " settings");
SetWindowText(hDlg, title);
free(title);
}
SetFocus(GetDlgItem(hDlg, ID_SAVE)); SetFocus(GetDlgItem(hDlg, ID_SAVE));
for (i = 0; default_options[i].name != NULL; i++) { for (i = 0; default_options[i].name != NULL; i++) {
name = default_options[i].name; name = default_options[i].name;
@@ -850,6 +860,8 @@ static void show_settings_dialog()
add_control(&p, dia, cl, ID_CONTROLS + i, style, add_control(&p, dia, cl, ID_CONTROLS + i, style,
(WORD) (x + LABEL_WIDTH), y, width, 12, ""); (WORD) (x + LABEL_WIDTH), y, width, 12, "");
nelems++; nelems++;
assert((int)p - (int)mem < sizeof(mem));
} }
y = (WORD) (((nelems + 1) / 2 + 1) * HEIGHT + 5); y = (WORD) (((nelems + 1) / 2 + 1) * HEIGHT + 5);
@@ -870,7 +882,9 @@ static void show_settings_dialog()
WIDTH - 280, y, 65, 12, "Reload active"); WIDTH - 280, y, 65, 12, "Reload active");
add_control(&p, dia, 0x82, ID_STATIC, add_control(&p, dia, 0x82, ID_STATIC,
WS_CHILD | WS_VISIBLE | WS_DISABLED, WS_CHILD | WS_VISIBLE | WS_DISABLED,
5, y, 100, 12, server_name); 5, y, 100, 12, server_base_name);
assert((int)p - (int)mem < sizeof(mem));
dia->cy = ((nelems + 1) / 2 + 1) * HEIGHT + 30; dia->cy = ((nelems + 1) / 2 + 1) * HEIGHT + 30;
DialogBoxIndirectParam(NULL, dia, NULL, DlgProc, (LPARAM) NULL); DialogBoxIndirectParam(NULL, dia, NULL, DlgProc, (LPARAM) NULL);
@@ -879,7 +893,7 @@ static void show_settings_dialog()
static int manage_service(int action) static int manage_service(int action)
{ {
static const char *service_name = "Civetweb"; static const char *service_name = "Civetweb"; /* TODO: check using server_name instead of service_name */
SC_HANDLE hSCM = NULL, hService = NULL; SC_HANDLE hSCM = NULL, hService = NULL;
SERVICE_DESCRIPTION descr = {server_name}; SERVICE_DESCRIPTION descr = {server_name};
char path[PATH_MAX + 20] = "";/* Path to executable plus magic argument */ char path[PATH_MAX + 20] = "";/* Path to executable plus magic argument */
@@ -924,16 +938,16 @@ static int manage_service(int action)
static LRESULT CALLBACK WindowProc(HWND hWnd, UINT msg, WPARAM wParam, static LRESULT CALLBACK WindowProc(HWND hWnd, UINT msg, WPARAM wParam,
LPARAM lParam) LPARAM lParam)
{ {
static SERVICE_TABLE_ENTRY service_table[] = { static SERVICE_TABLE_ENTRY service_table[2] = {0};
{server_name, (LPSERVICE_MAIN_FUNCTION) ServiceMain},
{NULL, NULL}
};
int service_installed; int service_installed;
char buf[200], *service_argv[] = {__argv[0], NULL}; char buf[200], *service_argv[] = {__argv[0], NULL};
POINT pt; POINT pt;
HMENU hMenu; HMENU hMenu;
static UINT s_uTaskbarRestart; /* for taskbar creation */ static UINT s_uTaskbarRestart; /* for taskbar creation */
service_table[0].lpServiceName = server_name;
service_table[0].lpServiceProc = (LPSERVICE_MAIN_FUNCTION)ServiceMain;
switch (msg) { switch (msg) {
case WM_CREATE: case WM_CREATE:
if (__argv[1] != NULL && if (__argv[1] != NULL &&