Sync main

This commit is contained in:
Sergey Lyubka 2015-03-17 17:35:31 +00:00
parent 22aeb6111b
commit c8e8f94ffe

View File

@ -71,12 +71,7 @@ static char server_name[50]; // Set by init_server_name()
static char s_config_file[PATH_MAX]; // Set by process_command_line_arguments
static struct mg_server *server; // Set by start_mongoose()
static const char *s_default_document_root = ".";
#ifndef NS_ENABLE_SSL
static const char *s_default_listening_port = "8080";
#else
static const char *s_default_listening_port = "ssl://8443:certs/cert.pem";
#endif
static char **s_argv = { NULL };
static void set_options(char *argv[]);
@ -101,11 +96,8 @@ static void __cdecl signal_handler(int sig_num) {
}
static void vnotify(const char *fmt, va_list ap, int must_exit) {
char msg[200];
vsnprintf(msg, sizeof(msg), fmt, ap);
fprintf(stderr, "%s\n", msg);
vfprintf(stderr, fmt, ap);
fputc('\n', stderr);
if (must_exit) {
exit(EXIT_FAILURE);
}