Normallized coding style in a predictable way.

Uses astyle program which is freely avaiable on all platforms.

Makefile

@@ -207,4 +207,10 @@ $(BUILD_DIR)/%.o : %.cpp
 $(BUILD_DIR)/%.o : %.c
 	$(CC) -c $(CFLAGS) $< -o $@
 
+# This rules is used to keep the code formatted in a reasonable manor
+# For this to work astyle must be installed and in the path
+# http://sourceforge.net/projects/astyle
+indent:
+	astyle --suffix=none --style=linux --indent=spaces=4 --lineend=linux  include/*.h src/*.c src/*.cpp src/*.inl examples/*/*.c  examples/*/*.cpp
+
 .PHONY: all help build install clean lib so

RELEASE_NOTES.md

@@ -21,6 +21,7 @@ Changes
 - Added CivetServer::getHeader method (Hariprasad Kamath)
 - Added new basic C embedding example
 - Conformed source files to UNIX line endings for consistency.
+- Unified the coding style to improve reability.
 
 Release Notes v1.3 
 ===

examples/chat/chat.c

@@ -24,26 +24,26 @@
 static const char *authorize_url = "/authorize";
 static const char *login_url = "/login.html";
 static const char *ajax_reply_start =
-  "HTTP/1.1 200 OK\r\n"
-  "Cache: no-cache\r\n"
-  "Content-Type: application/x-javascript\r\n"
-  "\r\n";
+    "HTTP/1.1 200 OK\r\n"
+    "Cache: no-cache\r\n"
+    "Content-Type: application/x-javascript\r\n"
+    "\r\n";
 
 // Describes single message sent to a chat. If user is empty (0 length),
 // the message is then originated from the server itself.
 struct message {
-  long id;                     // Message ID
-  char user[MAX_USER_LEN];     // User that have sent the message
-  char text[MAX_MESSAGE_LEN];  // Message text
-  time_t timestamp;            // Message timestamp, UTC
+    long id;                     // Message ID
+    char user[MAX_USER_LEN];     // User that have sent the message
+    char text[MAX_MESSAGE_LEN];  // Message text
+    time_t timestamp;            // Message timestamp, UTC
 };
 
 // Describes web session.
 struct session {
-  char session_id[33];      // Session ID, must be unique
-  char random[20];          // Random data used for extra user validation
-  char user[MAX_USER_LEN];  // Authenticated user
-  time_t expire;            // Expiration timestamp, UTC
+    char session_id[33];      // Session ID, must be unique
+    char random[20];          // Random data used for extra user validation
+    char user[MAX_USER_LEN];  // Authenticated user
+    time_t expire;            // Expiration timestamp, UTC
 };
 
 static struct message messages[MAX_MESSAGES];  // Ringbuffer for messages
@@ -54,332 +54,350 @@ static long last_message_id;
 static pthread_rwlock_t rwlock = PTHREAD_RWLOCK_INITIALIZER;
 
 // Get session object for the connection. Caller must hold the lock.
-static struct session *get_session(const struct mg_connection *conn) {
-  int i;
-  const char *cookie = mg_get_header(conn, "Cookie");
-  char session_id[33];
-  time_t now = time(NULL);
-  mg_get_cookie(cookie, "session", session_id, sizeof(session_id));
-  for (i = 0; i < MAX_SESSIONS; i++) {
-    if (sessions[i].expire != 0 &&
-        sessions[i].expire > now &&
-        strcmp(sessions[i].session_id, session_id) == 0) {
-      break;
+static struct session *get_session(const struct mg_connection *conn)
+{
+    int i;
+    const char *cookie = mg_get_header(conn, "Cookie");
+    char session_id[33];
+    time_t now = time(NULL);
+    mg_get_cookie(cookie, "session", session_id, sizeof(session_id));
+    for (i = 0; i < MAX_SESSIONS; i++) {
+        if (sessions[i].expire != 0 &&
+            sessions[i].expire > now &&
+            strcmp(sessions[i].session_id, session_id) == 0) {
+            break;
+        }
     }
-  }
-  return i == MAX_SESSIONS ? NULL : &sessions[i];
+    return i == MAX_SESSIONS ? NULL : &sessions[i];
 }
 
 static void get_qsvar(const struct mg_request_info *request_info,
-                      const char *name, char *dst, size_t dst_len) {
-  const char *qs = request_info->query_string;
-  mg_get_var(qs, strlen(qs == NULL ? "" : qs), name, dst, dst_len);
+                      const char *name, char *dst, size_t dst_len)
+{
+    const char *qs = request_info->query_string;
+    mg_get_var(qs, strlen(qs == NULL ? "" : qs), name, dst, dst_len);
 }
 
 // Get a get of messages with IDs greater than last_id and transform them
 // into a JSON string. Return that string to the caller. The string is
 // dynamically allocated, caller must free it. If there are no messages,
 // NULL is returned.
-static char *messages_to_json(long last_id) {
-  const struct message *message;
-  int max_msgs, len;
-  char buf[sizeof(messages)];  // Large enough to hold all messages
-
-  // Read-lock the ringbuffer. Loop over all messages, making a JSON string.
-  pthread_rwlock_rdlock(&rwlock);
-  len = 0;
-  max_msgs = sizeof(messages) / sizeof(messages[0]);
-  // If client is too far behind, return all messages.
-  if (last_message_id - last_id > max_msgs) {
-    last_id = last_message_id - max_msgs;
-  }
-  for (; last_id < last_message_id; last_id++) {
-    message = &messages[last_id % max_msgs];
-    if (message->timestamp == 0) {
-      break;
+static char *messages_to_json(long last_id)
+{
+    const struct message *message;
+    int max_msgs, len;
+    char buf[sizeof(messages)];  // Large enough to hold all messages
+
+    // Read-lock the ringbuffer. Loop over all messages, making a JSON string.
+    pthread_rwlock_rdlock(&rwlock);
+    len = 0;
+    max_msgs = sizeof(messages) / sizeof(messages[0]);
+    // If client is too far behind, return all messages.
+    if (last_message_id - last_id > max_msgs) {
+        last_id = last_message_id - max_msgs;
     }
-    // buf is allocated on stack and hopefully is large enough to hold all
-    // messages (it may be too small if the ringbuffer is full and all
-    // messages are large. in this case asserts will trigger).
-    len += snprintf(buf + len, sizeof(buf) - len,
-        "{user: '%s', text: '%s', timestamp: %lu, id: %lu},",
-        message->user, message->text, message->timestamp, message->id);
-    assert(len > 0);
-    assert((size_t) len < sizeof(buf));
-  }
-  pthread_rwlock_unlock(&rwlock);
-
-  return len == 0 ? NULL : strdup(buf);
+    for (; last_id < last_message_id; last_id++) {
+        message = &messages[last_id % max_msgs];
+        if (message->timestamp == 0) {
+            break;
+        }
+        // buf is allocated on stack and hopefully is large enough to hold all
+        // messages (it may be too small if the ringbuffer is full and all
+        // messages are large. in this case asserts will trigger).
+        len += snprintf(buf + len, sizeof(buf) - len,
+                        "{user: '%s', text: '%s', timestamp: %lu, id: %lu},",
+                        message->user, message->text, message->timestamp, message->id);
+        assert(len > 0);
+        assert((size_t) len < sizeof(buf));
+    }
+    pthread_rwlock_unlock(&rwlock);
+
+    return len == 0 ? NULL : strdup(buf);
 }
 
 // If "callback" param is present in query string, this is JSONP call.
 // Return 1 in this case, or 0 if "callback" is not specified.
 // Wrap an output in Javascript function call.
 static int handle_jsonp(struct mg_connection *conn,
-                        const struct mg_request_info *request_info) {
-  char cb[64];
+                        const struct mg_request_info *request_info)
+{
+    char cb[64];
 
-  get_qsvar(request_info, "callback", cb, sizeof(cb));
-  if (cb[0] != '\0') {
-    mg_printf(conn, "%s(", cb);
-  }
+    get_qsvar(request_info, "callback", cb, sizeof(cb));
+    if (cb[0] != '\0') {
+        mg_printf(conn, "%s(", cb);
+    }
 
-  return cb[0] == '\0' ? 0 : 1;
+    return cb[0] == '\0' ? 0 : 1;
 }
 
 // A handler for the /ajax/get_messages endpoint.
 // Return a list of messages with ID greater than requested.
 static void ajax_get_messages(struct mg_connection *conn,
-                              const struct mg_request_info *request_info) {
-  char last_id[32], *json;
-  int is_jsonp;
-
-  mg_printf(conn, "%s", ajax_reply_start);
-  is_jsonp = handle_jsonp(conn, request_info);
-
-  get_qsvar(request_info, "last_id", last_id, sizeof(last_id));
-  if ((json = messages_to_json(strtoul(last_id, NULL, 10))) != NULL) {
-    mg_printf(conn, "[%s]", json);
-    free(json);
-  }
-
-  if (is_jsonp) {
-    mg_printf(conn, "%s", ")");
-  }
+                              const struct mg_request_info *request_info)
+{
+    char last_id[32], *json;
+    int is_jsonp;
+
+    mg_printf(conn, "%s", ajax_reply_start);
+    is_jsonp = handle_jsonp(conn, request_info);
+
+    get_qsvar(request_info, "last_id", last_id, sizeof(last_id));
+    if ((json = messages_to_json(strtoul(last_id, NULL, 10))) != NULL) {
+        mg_printf(conn, "[%s]", json);
+        free(json);
+    }
+
+    if (is_jsonp) {
+        mg_printf(conn, "%s", ")");
+    }
 }
 
 // Allocate new message. Caller must hold the lock.
-static struct message *new_message(void) {
-  static int size = sizeof(messages) / sizeof(messages[0]);
-  struct message *message = &messages[last_message_id % size];
-  message->id = last_message_id++;
-  message->timestamp = time(0);
-  return message;
+static struct message *new_message(void)
+{
+    static int size = sizeof(messages) / sizeof(messages[0]);
+    struct message *message = &messages[last_message_id % size];
+    message->id = last_message_id++;
+    message->timestamp = time(0);
+    return message;
 }
 
-static void my_strlcpy(char *dst, const char *src, size_t len) {
-  strncpy(dst, src, len);
-  dst[len - 1] = '\0';
+static void my_strlcpy(char *dst, const char *src, size_t len)
+{
+    strncpy(dst, src, len);
+    dst[len - 1] = '\0';
 }
 
 // A handler for the /ajax/send_message endpoint.
 static void ajax_send_message(struct mg_connection *conn,
-                              const struct mg_request_info *request_info) {
-  struct message *message;
-  struct session *session;
-  char text[sizeof(message->text) - 1];
-  int is_jsonp;
-
-  mg_printf(conn, "%s", ajax_reply_start);
-  is_jsonp = handle_jsonp(conn, request_info);
-
-  get_qsvar(request_info, "text", text, sizeof(text));
-  if (text[0] != '\0') {
-    // We have a message to store. Write-lock the ringbuffer,
-    // grab the next message and copy data into it.
-    pthread_rwlock_wrlock(&rwlock);
-    message = new_message();
-    // TODO(lsm): JSON-encode all text strings
-    session = get_session(conn);
-    assert(session != NULL);
-    my_strlcpy(message->text, text, sizeof(text));
-    my_strlcpy(message->user, session->user, sizeof(message->user));
-    pthread_rwlock_unlock(&rwlock);
-  }
+                              const struct mg_request_info *request_info)
+{
+    struct message *message;
+    struct session *session;
+    char text[sizeof(message->text) - 1];
+    int is_jsonp;
+
+    mg_printf(conn, "%s", ajax_reply_start);
+    is_jsonp = handle_jsonp(conn, request_info);
+
+    get_qsvar(request_info, "text", text, sizeof(text));
+    if (text[0] != '\0') {
+        // We have a message to store. Write-lock the ringbuffer,
+        // grab the next message and copy data into it.
+        pthread_rwlock_wrlock(&rwlock);
+        message = new_message();
+        // TODO(lsm): JSON-encode all text strings
+        session = get_session(conn);
+        assert(session != NULL);
+        my_strlcpy(message->text, text, sizeof(text));
+        my_strlcpy(message->user, session->user, sizeof(message->user));
+        pthread_rwlock_unlock(&rwlock);
+    }
 
-  mg_printf(conn, "%s", text[0] == '\0' ? "false" : "true");
+    mg_printf(conn, "%s", text[0] == '\0' ? "false" : "true");
 
-  if (is_jsonp) {
-    mg_printf(conn, "%s", ")");
-  }
+    if (is_jsonp) {
+        mg_printf(conn, "%s", ")");
+    }
 }
 
 // Redirect user to the login form. In the cookie, store the original URL
 // we came from, so that after the authorization we could redirect back.
 static void redirect_to_login(struct mg_connection *conn,
-                              const struct mg_request_info *request_info) {
-  mg_printf(conn, "HTTP/1.1 302 Found\r\n"
-      "Set-Cookie: original_url=%s\r\n"
-      "Location: %s\r\n\r\n",
-      request_info->uri, login_url);
+                              const struct mg_request_info *request_info)
+{
+    mg_printf(conn, "HTTP/1.1 302 Found\r\n"
+              "Set-Cookie: original_url=%s\r\n"
+              "Location: %s\r\n\r\n",
+              request_info->uri, login_url);
 }
 
 // Return 1 if username/password is allowed, 0 otherwise.
-static int check_password(const char *user, const char *password) {
-  // In production environment we should ask an authentication system
-  // to authenticate the user.
-  // Here however we do trivial check that user and password are not empty
-  return (user[0] && password[0]);
+static int check_password(const char *user, const char *password)
+{
+    // In production environment we should ask an authentication system
+    // to authenticate the user.
+    // Here however we do trivial check that user and password are not empty
+    return (user[0] && password[0]);
 }
 
 // Allocate new session object
-static struct session *new_session(void) {
-  int i;
-  time_t now = time(NULL);
-  pthread_rwlock_wrlock(&rwlock);
-  for (i = 0; i < MAX_SESSIONS; i++) {
-    if (sessions[i].expire == 0 || sessions[i].expire < now) {
-      sessions[i].expire = time(0) + SESSION_TTL;
-      break;
+static struct session *new_session(void)
+{
+    int i;
+    time_t now = time(NULL);
+    pthread_rwlock_wrlock(&rwlock);
+    for (i = 0; i < MAX_SESSIONS; i++) {
+        if (sessions[i].expire == 0 || sessions[i].expire < now) {
+            sessions[i].expire = time(0) + SESSION_TTL;
+            break;
+        }
     }
-  }
-  pthread_rwlock_unlock(&rwlock);
-  return i == MAX_SESSIONS ? NULL : &sessions[i];
+    pthread_rwlock_unlock(&rwlock);
+    return i == MAX_SESSIONS ? NULL : &sessions[i];
 }
 
 // Generate session ID. buf must be 33 bytes in size.
 // Note that it is easy to steal session cookies by sniffing traffic.
 // This is why all communication must be SSL-ed.
 static void generate_session_id(char *buf, const char *random,
-                                const char *user) {
-  mg_md5(buf, random, user, NULL);
+                                const char *user)
+{
+    mg_md5(buf, random, user, NULL);
 }
 
-static void send_server_message(const char *fmt, ...) {
-  va_list ap;
-  struct message *message;
+static void send_server_message(const char *fmt, ...)
+{
+    va_list ap;
+    struct message *message;
 
-  pthread_rwlock_wrlock(&rwlock);
-  message = new_message();
-  message->user[0] = '\0';  // Empty user indicates server message
-  va_start(ap, fmt);
-  vsnprintf(message->text, sizeof(message->text), fmt, ap);
-  va_end(ap);
+    pthread_rwlock_wrlock(&rwlock);
+    message = new_message();
+    message->user[0] = '\0';  // Empty user indicates server message
+    va_start(ap, fmt);
+    vsnprintf(message->text, sizeof(message->text), fmt, ap);
+    va_end(ap);
 
-  pthread_rwlock_unlock(&rwlock);
+    pthread_rwlock_unlock(&rwlock);
 }
 
 // A handler for the /authorize endpoint.
 // Login page form sends user name and password to this endpoint.
 static void authorize(struct mg_connection *conn,
-                      const struct mg_request_info *request_info) {
-  char user[MAX_USER_LEN], password[MAX_USER_LEN];
-  struct session *session;
-
-  // Fetch user name and password.
-  get_qsvar(request_info, "user", user, sizeof(user));
-  get_qsvar(request_info, "password", password, sizeof(password));
-
-  if (check_password(user, password) && (session = new_session()) != NULL) {
-    // Authentication success:
-    //   1. create new session
-    //   2. set session ID token in the cookie
-    //   3. remove original_url from the cookie - not needed anymore
-    //   4. redirect client back to the original URL
-    //
-    // The most secure way is to stay HTTPS all the time. However, just to
-    // show the technique, we redirect to HTTP after the successful
-    // authentication. The danger of doing this is that session cookie can
-    // be stolen and an attacker may impersonate the user.
-    // Secure application must use HTTPS all the time.
-    my_strlcpy(session->user, user, sizeof(session->user));
-    snprintf(session->random, sizeof(session->random), "%d", rand());
-    generate_session_id(session->session_id, session->random, session->user);
-    send_server_message("<%s> joined", session->user);
-    mg_printf(conn, "HTTP/1.1 302 Found\r\n"
-        "Set-Cookie: session=%s; max-age=3600; http-only\r\n"  // Session ID
-        "Set-Cookie: user=%s\r\n"  // Set user, needed by Javascript code
-        "Set-Cookie: original_url=/; max-age=0\r\n"  // Delete original_url
-        "Location: /\r\n\r\n",
-        session->session_id, session->user);
-  } else {
-    // Authentication failure, redirect to login.
-    redirect_to_login(conn, request_info);
-  }
+                      const struct mg_request_info *request_info)
+{
+    char user[MAX_USER_LEN], password[MAX_USER_LEN];
+    struct session *session;
+
+    // Fetch user name and password.
+    get_qsvar(request_info, "user", user, sizeof(user));
+    get_qsvar(request_info, "password", password, sizeof(password));
+
+    if (check_password(user, password) && (session = new_session()) != NULL) {
+        // Authentication success:
+        //   1. create new session
+        //   2. set session ID token in the cookie
+        //   3. remove original_url from the cookie - not needed anymore
+        //   4. redirect client back to the original URL
+        //
+        // The most secure way is to stay HTTPS all the time. However, just to
+        // show the technique, we redirect to HTTP after the successful
+        // authentication. The danger of doing this is that session cookie can
+        // be stolen and an attacker may impersonate the user.
+        // Secure application must use HTTPS all the time.
+        my_strlcpy(session->user, user, sizeof(session->user));
+        snprintf(session->random, sizeof(session->random), "%d", rand());
+        generate_session_id(session->session_id, session->random, session->user);
+        send_server_message("<%s> joined", session->user);
+        mg_printf(conn, "HTTP/1.1 302 Found\r\n"
+                  "Set-Cookie: session=%s; max-age=3600; http-only\r\n"  // Session ID
+                  "Set-Cookie: user=%s\r\n"  // Set user, needed by Javascript code
+                  "Set-Cookie: original_url=/; max-age=0\r\n"  // Delete original_url
+                  "Location: /\r\n\r\n",
+                  session->session_id, session->user);
+    } else {
+        // Authentication failure, redirect to login.
+        redirect_to_login(conn, request_info);
+    }
 }
 
 // Return 1 if request is authorized, 0 otherwise.
 static int is_authorized(const struct mg_connection *conn,
-                         const struct mg_request_info *request_info) {
-  struct session *session;
-  char valid_id[33];
-  int authorized = 0;
-
-  // Always authorize accesses to login page and to authorize URI
-  if (!strcmp(request_info->uri, login_url) ||
-      !strcmp(request_info->uri, authorize_url)) {
-    return 1;
-  }
-
-  pthread_rwlock_rdlock(&rwlock);
-  if ((session = get_session(conn)) != NULL) {
-    generate_session_id(valid_id, session->random, session->user);
-    if (strcmp(valid_id, session->session_id) == 0) {
-      session->expire = time(0) + SESSION_TTL;
-      authorized = 1;
+                         const struct mg_request_info *request_info)
+{
+    struct session *session;
+    char valid_id[33];
+    int authorized = 0;
+
+    // Always authorize accesses to login page and to authorize URI
+    if (!strcmp(request_info->uri, login_url) ||
+        !strcmp(request_info->uri, authorize_url)) {
+        return 1;
+    }
+
+    pthread_rwlock_rdlock(&rwlock);
+    if ((session = get_session(conn)) != NULL) {
+        generate_session_id(valid_id, session->random, session->user);
+        if (strcmp(valid_id, session->session_id) == 0) {
+            session->expire = time(0) + SESSION_TTL;
+            authorized = 1;
+        }
     }
-  }
-  pthread_rwlock_unlock(&rwlock);
+    pthread_rwlock_unlock(&rwlock);
 
-  return authorized;
+    return authorized;
 }
 
 static void redirect_to_ssl(struct mg_connection *conn,
-                            const struct mg_request_info *request_info) {
-  const char *p, *host = mg_get_header(conn, "Host");
-  if (host != NULL && (p = strchr(host, ':')) != NULL) {
-    mg_printf(conn, "HTTP/1.1 302 Found\r\n"
-              "Location: https://%.*s:8082/%s:8082\r\n\r\n",
-              (int) (p - host), host, request_info->uri);
-  } else {
-    mg_printf(conn, "%s", "HTTP/1.1 500 Error\r\n\r\nHost: header is not set");
-  }
+                            const struct mg_request_info *request_info)
+{
+    const char *p, *host = mg_get_header(conn, "Host");
+    if (host != NULL && (p = strchr(host, ':')) != NULL) {
+        mg_printf(conn, "HTTP/1.1 302 Found\r\n"
+                  "Location: https://%.*s:8082/%s:8082\r\n\r\n",
+                  (int) (p - host), host, request_info->uri);
+    } else {
+        mg_printf(conn, "%s", "HTTP/1.1 500 Error\r\n\r\nHost: header is not set");
+    }
 }
 
-static int begin_request_handler(struct mg_connection *conn) {
-  const struct mg_request_info *request_info = mg_get_request_info(conn);
-  int processed = 1;
-
-  if (!request_info->is_ssl) {
-    redirect_to_ssl(conn, request_info);
-  } else if (!is_authorized(conn, request_info)) {
-    redirect_to_login(conn, request_info);
-  } else if (strcmp(request_info->uri, authorize_url) == 0) {
-    authorize(conn, request_info);
-  } else if (strcmp(request_info->uri, "/ajax/get_messages") == 0) {
-    ajax_get_messages(conn, request_info);
-  } else if (strcmp(request_info->uri, "/ajax/send_message") == 0) {
-    ajax_send_message(conn, request_info);
-  } else {
-    // No suitable handler found, mark as not processed. Civetweb will
-    // try to serve the request.
-    processed = 0;
-  }
-  return processed;
+static int begin_request_handler(struct mg_connection *conn)
+{
+    const struct mg_request_info *request_info = mg_get_request_info(conn);
+    int processed = 1;
+
+    if (!request_info->is_ssl) {
+        redirect_to_ssl(conn, request_info);
+    } else if (!is_authorized(conn, request_info)) {
+        redirect_to_login(conn, request_info);
+    } else if (strcmp(request_info->uri, authorize_url) == 0) {
+        authorize(conn, request_info);
+    } else if (strcmp(request_info->uri, "/ajax/get_messages") == 0) {
+        ajax_get_messages(conn, request_info);
+    } else if (strcmp(request_info->uri, "/ajax/send_message") == 0) {
+        ajax_send_message(conn, request_info);
+    } else {
+        // No suitable handler found, mark as not processed. Civetweb will
+        // try to serve the request.
+        processed = 0;
+    }
+    return processed;
 }
 
 static const char *options[] = {
-  "document_root", "html",
-  "listening_ports", "8081,8082s",
-  "ssl_certificate", "ssl_cert.pem",
-  "num_threads", "5",
-  NULL
+    "document_root", "html",
+    "listening_ports", "8081,8082s",
+    "ssl_certificate", "ssl_cert.pem",
+    "num_threads", "5",
+    NULL
 };
 
-int main(void) {
-  struct mg_callbacks callbacks;
-  struct mg_context *ctx;
-
-  // Initialize random number generator. It will be used later on for
-  // the session identifier creation.
-  srand((unsigned) time(0));
-
-  // Setup and start Civetweb
-  memset(&callbacks, 0, sizeof(callbacks));
-  callbacks.begin_request = begin_request_handler;
-  if ((ctx = mg_start(&callbacks, NULL, options)) == NULL) {
-    printf("%s\n", "Cannot start chat server, fatal exit");
-    exit(EXIT_FAILURE);
-  }
-
-  // Wait until enter is pressed, then exit
-  printf("Chat server started on ports %s, press enter to quit.\n",
-         mg_get_option(ctx, "listening_ports"));
-  getchar();
-  mg_stop(ctx);
-  printf("%s\n", "Chat server stopped.");
-
-  return EXIT_SUCCESS;
+int main(void)
+{
+    struct mg_callbacks callbacks;
+    struct mg_context *ctx;
+
+    // Initialize random number generator. It will be used later on for
+    // the session identifier creation.
+    srand((unsigned) time(0));
+
+    // Setup and start Civetweb
+    memset(&callbacks, 0, sizeof(callbacks));
+    callbacks.begin_request = begin_request_handler;
+    if ((ctx = mg_start(&callbacks, NULL, options)) == NULL) {
+        printf("%s\n", "Cannot start chat server, fatal exit");
+        exit(EXIT_FAILURE);
+    }
+
+    // Wait until enter is pressed, then exit
+    printf("Chat server started on ports %s, press enter to quit.\n",
+           mg_get_option(ctx, "listening_ports"));
+    getchar();
+    mg_stop(ctx);
+    printf("%s\n", "Chat server stopped.");
+
+    return EXIT_SUCCESS;
 }
 
 // vim:ts=2:sw=2:et

examples/embedded_c/embedded_c.c

@@ -21,24 +21,27 @@
 #define EXIT_URI "/exit"
 int exitNow = 0;
 
-int ExampleHandler(struct mg_connection *conn, void *cbdata) {
+int ExampleHandler(struct mg_connection *conn, void *cbdata)
+{
     mg_printf(conn, "HTTP/1.1 200 OK\r\nContent-Type: text/html\r\n\r\n");
     mg_printf(conn, "<html><body>");
     mg_printf(conn, "<h2>This is example text!!!</h2>");
     mg_printf(conn, "<p>To exit <a href=\"%s\">click here</a></p>",
-        EXIT_URI);
+              EXIT_URI);
     mg_printf(conn, "</body></html>\n");
     return 1;
 }
 
-int ExitHandler(struct mg_connection *conn, void *cbdata) {
+int ExitHandler(struct mg_connection *conn, void *cbdata)
+{
     mg_printf(conn, "HTTP/1.1 200 OK\r\nContent-Type: text/plain\r\n\r\n");
     mg_printf(conn, "Bye!\n");
     exitNow = 1;
     return 1;
 }
 
-int AHandler(struct mg_connection *conn, void *cbdata) {
+int AHandler(struct mg_connection *conn, void *cbdata)
+{
     mg_printf(conn, "HTTP/1.1 200 OK\r\nContent-Type: text/html\r\n\r\n");
     mg_printf(conn, "<html><body>");
     mg_printf(conn, "<h2>This is the A handler!!!</h2>");
@@ -46,7 +49,8 @@ int AHandler(struct mg_connection *conn, void *cbdata) {
     return 1;
 }
 
-int ABHandler(struct mg_connection *conn, void *cbdata) {
+int ABHandler(struct mg_connection *conn, void *cbdata)
+{
     mg_printf(conn, "HTTP/1.1 200 OK\r\nContent-Type: text/html\r\n\r\n");
     mg_printf(conn, "<html><body>");
     mg_printf(conn, "<h2>This is the AB handler!!!</h2>");
@@ -55,10 +59,12 @@ int ABHandler(struct mg_connection *conn, void *cbdata) {
 }
 
 
-int main(int argc, char *argv[]) {
+int main(int argc, char *argv[])
+{
 
     const char * options[] = { "document_root", DOCUMENT_ROOT,
-        "listening_ports", PORT, 0 };
+                               "listening_ports", PORT, 0
+                             };
     struct mg_callbacks callbacks;
     struct mg_context *ctx;
 

examples/embedded_cpp/embedded_cpp.cpp

@@ -17,20 +17,22 @@
 #define EXIT_URI "/exit"
 bool exitNow = false;
 
-class ExampleHandler: public CivetHandler {
+class ExampleHandler: public CivetHandler
+{
 public:
     bool handleGet(CivetServer *server, struct mg_connection *conn) {
         mg_printf(conn, "HTTP/1.1 200 OK\r\nContent-Type: text/html\r\n\r\n");
         mg_printf(conn, "<html><body>");
         mg_printf(conn, "<h2>This is example text!!!</h2>");
         mg_printf(conn, "<p>To exit <a href=\"%s\">click here</a></p>",
-                EXIT_URI);
+                  EXIT_URI);
         mg_printf(conn, "</body></html>\n");
         return true;
     }
 };
 
-class ExitHandler: public CivetHandler {
+class ExitHandler: public CivetHandler
+{
 public:
     bool handleGet(CivetServer *server, struct mg_connection *conn) {
         mg_printf(conn, "HTTP/1.1 200 OK\r\nContent-Type: text/plain\r\n\r\n");
@@ -40,7 +42,8 @@ public:
     }
 };
 
-class AHandler: public CivetHandler {
+class AHandler: public CivetHandler
+{
 public:
     bool handleGet(CivetServer *server, struct mg_connection *conn) {
         mg_printf(conn, "HTTP/1.1 200 OK\r\nContent-Type: text/html\r\n\r\n");
@@ -51,7 +54,8 @@ public:
     }
 };
 
-class ABHandler: public CivetHandler {
+class ABHandler: public CivetHandler
+{
 public:
     bool handleGet(CivetServer *server, struct mg_connection *conn) {
         mg_printf(conn, "HTTP/1.1 200 OK\r\nContent-Type: text/html\r\n\r\n");
@@ -62,10 +66,12 @@ public:
     }
 };
 
-int main(int argc, char *argv[]) {
+int main(int argc, char *argv[])
+{
 
     const char * options[] = { "document_root", DOCUMENT_ROOT,
-            "listening_ports", PORT, 0 };
+                               "listening_ports", PORT, 0
+                             };
 
     CivetServer server(options);
 

examples/hello/hello.c

@@ -3,49 +3,51 @@
 #include "civetweb.h"
 
 // This function will be called by civetweb on every new request.
-static int begin_request_handler(struct mg_connection *conn) {
-  const struct mg_request_info *request_info = mg_get_request_info(conn);
-  char content[100];
-
-  // Prepare the message we're going to send
-  int content_length = snprintf(content, sizeof(content),
-                                "Hello from civetweb! Remote port: %d",
-                                request_info->remote_port);
-
-  // Send HTTP reply to the client
-  mg_printf(conn,
-            "HTTP/1.1 200 OK\r\n"
-            "Content-Type: text/plain\r\n"
-            "Content-Length: %d\r\n"        // Always set Content-Length
-            "\r\n"
-            "%s",
-            content_length, content);
-
-  // Returning non-zero tells civetweb that our function has replied to
-  // the client, and civetweb should not send client any more data.
-  return 1;
+static int begin_request_handler(struct mg_connection *conn)
+{
+    const struct mg_request_info *request_info = mg_get_request_info(conn);
+    char content[100];
+
+    // Prepare the message we're going to send
+    int content_length = snprintf(content, sizeof(content),
+                                  "Hello from civetweb! Remote port: %d",
+                                  request_info->remote_port);
+
+    // Send HTTP reply to the client
+    mg_printf(conn,
+              "HTTP/1.1 200 OK\r\n"
+              "Content-Type: text/plain\r\n"
+              "Content-Length: %d\r\n"        // Always set Content-Length
+              "\r\n"
+              "%s",
+              content_length, content);
+
+    // Returning non-zero tells civetweb that our function has replied to
+    // the client, and civetweb should not send client any more data.
+    return 1;
 }
 
-int main(void) {
-  struct mg_context *ctx;
-  struct mg_callbacks callbacks;
+int main(void)
+{
+    struct mg_context *ctx;
+    struct mg_callbacks callbacks;
 
-  // List of options. Last element must be NULL.
-  const char *options[] = {"listening_ports", "8080", NULL};
+    // List of options. Last element must be NULL.
+    const char *options[] = {"listening_ports", "8080", NULL};
 
-  // Prepare callbacks structure. We have only one callback, the rest are NULL.
-  memset(&callbacks, 0, sizeof(callbacks));
-  callbacks.begin_request = begin_request_handler;
+    // Prepare callbacks structure. We have only one callback, the rest are NULL.
+    memset(&callbacks, 0, sizeof(callbacks));
+    callbacks.begin_request = begin_request_handler;
 
-  // Start the web server.
-  ctx = mg_start(&callbacks, NULL, options);
+    // Start the web server.
+    ctx = mg_start(&callbacks, NULL, options);
 
-  // Wait until user hits "enter". Server is running in separate thread.
-  // Navigating to http://localhost:8080 will invoke begin_request_handler().
-  getchar();
+    // Wait until user hits "enter". Server is running in separate thread.
+    // Navigating to http://localhost:8080 will invoke begin_request_handler().
+    getchar();
 
-  // Stop the server.
-  mg_stop(ctx);
+    // Stop the server.
+    mg_stop(ctx);
 
-  return 0;
+    return 0;
 }

examples/lua/lua_dll.c

@@ -3,17 +3,19 @@
 #include "lua.h"
 #include "lauxlib.h"
 
-static int smile(lua_State *L) {
-  (void) L;  // Unused
-  printf("%s\n", ":-)");
-  return 0;
+static int smile(lua_State *L)
+{
+    (void) L;  // Unused
+    printf("%s\n", ":-)");
+    return 0;
 }
 
-int LUA_API luaopen_lua_dll(lua_State *L) {
-  static const struct luaL_Reg api[] = {
-    {"smile", smile},
-    {NULL, NULL},
-  };
-  luaL_openlib(L, "lua_dll", api, 0);
-  return 1;
+int LUA_API luaopen_lua_dll(lua_State *L)
+{
+    static const struct luaL_Reg api[] = {
+        {"smile", smile},
+        {NULL, NULL},
+    };
+    luaL_openlib(L, "lua_dll", api, 0);
+    return 1;
 }

examples/post/post.c

@@ -3,54 +3,56 @@
 #include "civetweb.h"
 
 static const char *html_form =
-  "<html><body>POST example."
-  "<form method=\"POST\" action=\"/handle_post_request\">"
-  "Input 1: <input type=\"text\" name=\"input_1\" /> <br/>"
-  "Input 2: <input type=\"text\" name=\"input_2\" /> <br/>"
-  "<input type=\"submit\" />"
-  "</form></body></html>";
-
-static int begin_request_handler(struct mg_connection *conn) {
-  const struct mg_request_info *ri = mg_get_request_info(conn);
-  char post_data[1024], input1[sizeof(post_data)], input2[sizeof(post_data)];
-  int post_data_len;
-
-  if (!strcmp(ri->uri, "/handle_post_request")) {
-    // User has submitted a form, show submitted data and a variable value
-    post_data_len = mg_read(conn, post_data, sizeof(post_data));
-
-    // Parse form data. input1 and input2 are guaranteed to be NUL-terminated
-    mg_get_var(post_data, post_data_len, "input_1", input1, sizeof(input1));
-    mg_get_var(post_data, post_data_len, "input_2", input2, sizeof(input2));
-
-    // Send reply to the client, showing submitted form values.
-    mg_printf(conn, "HTTP/1.0 200 OK\r\n"
-              "Content-Type: text/plain\r\n\r\n"
-              "Submitted data: [%.*s]\n"
-              "Submitted data length: %d bytes\n"
-              "input_1: [%s]\n"
-              "input_2: [%s]\n",
-              post_data_len, post_data, post_data_len, input1, input2);
-  } else {
-    // Show HTML form.
-    mg_printf(conn, "HTTP/1.0 200 OK\r\n"
-              "Content-Length: %d\r\n"
-              "Content-Type: text/html\r\n\r\n%s",
-              (int) strlen(html_form), html_form);
-  }
-  return 1;  // Mark request as processed
+    "<html><body>POST example."
+    "<form method=\"POST\" action=\"/handle_post_request\">"
+    "Input 1: <input type=\"text\" name=\"input_1\" /> <br/>"
+    "Input 2: <input type=\"text\" name=\"input_2\" /> <br/>"
+    "<input type=\"submit\" />"
+    "</form></body></html>";
+
+static int begin_request_handler(struct mg_connection *conn)
+{
+    const struct mg_request_info *ri = mg_get_request_info(conn);
+    char post_data[1024], input1[sizeof(post_data)], input2[sizeof(post_data)];
+    int post_data_len;
+
+    if (!strcmp(ri->uri, "/handle_post_request")) {
+        // User has submitted a form, show submitted data and a variable value
+        post_data_len = mg_read(conn, post_data, sizeof(post_data));
+
+        // Parse form data. input1 and input2 are guaranteed to be NUL-terminated
+        mg_get_var(post_data, post_data_len, "input_1", input1, sizeof(input1));
+        mg_get_var(post_data, post_data_len, "input_2", input2, sizeof(input2));
+
+        // Send reply to the client, showing submitted form values.
+        mg_printf(conn, "HTTP/1.0 200 OK\r\n"
+                  "Content-Type: text/plain\r\n\r\n"
+                  "Submitted data: [%.*s]\n"
+                  "Submitted data length: %d bytes\n"
+                  "input_1: [%s]\n"
+                  "input_2: [%s]\n",
+                  post_data_len, post_data, post_data_len, input1, input2);
+    } else {
+        // Show HTML form.
+        mg_printf(conn, "HTTP/1.0 200 OK\r\n"
+                  "Content-Length: %d\r\n"
+                  "Content-Type: text/html\r\n\r\n%s",
+                  (int) strlen(html_form), html_form);
+    }
+    return 1;  // Mark request as processed
 }
 
-int main(void) {
-  struct mg_context *ctx;
-  const char *options[] = {"listening_ports", "8080", NULL};
-  struct mg_callbacks callbacks;
+int main(void)
+{
+    struct mg_context *ctx;
+    const char *options[] = {"listening_ports", "8080", NULL};
+    struct mg_callbacks callbacks;
 
-  memset(&callbacks, 0, sizeof(callbacks));
-  callbacks.begin_request = begin_request_handler;
-  ctx = mg_start(&callbacks, NULL, options);
-  getchar();  // Wait until user hits "enter"
-  mg_stop(ctx);
+    memset(&callbacks, 0, sizeof(callbacks));
+    callbacks.begin_request = begin_request_handler;
+    ctx = mg_start(&callbacks, NULL, options);
+    getchar();  // Wait until user hits "enter"
+    mg_stop(ctx);
 
-  return 0;
+    return 0;
 }

examples/upload/upload.c

@@ -17,45 +17,48 @@ typedef __int64 int64_t;
 
 #include "civetweb.h"
 
-static int begin_request_handler(struct mg_connection *conn) {
-  if (!strcmp(mg_get_request_info(conn)->uri, "/handle_post_request")) {
-    mg_printf(conn, "%s", "HTTP/1.0 200 OK\r\n\r\n");
-    mg_upload(conn, "/tmp");
-  } else {
-    // Show HTML form. Make sure it has enctype="multipart/form-data" attr.
-    static const char *html_form =
-      "<html><body>Upload example."
-      "<form method=\"POST\" action=\"/handle_post_request\" "
-      "  enctype=\"multipart/form-data\">"
-      "<input type=\"file\" name=\"file\" /> <br/>"
-      "<input type=\"submit\" value=\"Upload\" />"
-      "</form></body></html>";
-
-    mg_printf(conn, "HTTP/1.0 200 OK\r\n"
-              "Content-Length: %d\r\n"
-              "Content-Type: text/html\r\n\r\n%s",
-              (int) strlen(html_form), html_form);
-  }
-
-  // Mark request as processed
-  return 1;
+static int begin_request_handler(struct mg_connection *conn)
+{
+    if (!strcmp(mg_get_request_info(conn)->uri, "/handle_post_request")) {
+        mg_printf(conn, "%s", "HTTP/1.0 200 OK\r\n\r\n");
+        mg_upload(conn, "/tmp");
+    } else {
+        // Show HTML form. Make sure it has enctype="multipart/form-data" attr.
+        static const char *html_form =
+            "<html><body>Upload example."
+            "<form method=\"POST\" action=\"/handle_post_request\" "
+            "  enctype=\"multipart/form-data\">"
+            "<input type=\"file\" name=\"file\" /> <br/>"
+            "<input type=\"submit\" value=\"Upload\" />"
+            "</form></body></html>";
+
+        mg_printf(conn, "HTTP/1.0 200 OK\r\n"
+                  "Content-Length: %d\r\n"
+                  "Content-Type: text/html\r\n\r\n%s",
+                  (int) strlen(html_form), html_form);
+    }
+
+    // Mark request as processed
+    return 1;
 }
 
-static void upload_handler(struct mg_connection *conn, const char *path) {
-  mg_printf(conn, "Saved [%s]", path);
+static void upload_handler(struct mg_connection *conn, const char *path)
+{
+    mg_printf(conn, "Saved [%s]", path);
 }
 
-int main(void) {
-  struct mg_context *ctx;
-  const char *options[] = {"listening_ports", "8080", NULL};
-  struct mg_callbacks callbacks;
+int main(void)
+{
+    struct mg_context *ctx;
+    const char *options[] = {"listening_ports", "8080", NULL};
+    struct mg_callbacks callbacks;
 
-  memset(&callbacks, 0, sizeof(callbacks));
-  callbacks.begin_request = begin_request_handler;
-  callbacks.upload = upload_handler;
-  ctx = mg_start(&callbacks, NULL, options);
-  getchar();  // Wait until user hits "enter"
-  mg_stop(ctx);
+    memset(&callbacks, 0, sizeof(callbacks));
+    callbacks.begin_request = begin_request_handler;
+    callbacks.upload = upload_handler;
+    ctx = mg_start(&callbacks, NULL, options);
+    getchar();  // Wait until user hits "enter"
+    mg_stop(ctx);
 
-  return 0;
+    return 0;
 }

examples/websocket/websocket.c

@@ -5,9 +5,10 @@
 #include <string.h>
 #include "civetweb.h"
 
-static void websocket_ready_handler(struct mg_connection *conn) {
-  static const char *message = "server ready";
-  mg_websocket_write(conn, WEBSOCKET_OPCODE_TEXT, message, strlen(message));
+static void websocket_ready_handler(struct mg_connection *conn)
+{
+    static const char *message = "server ready";
+    mg_websocket_write(conn, WEBSOCKET_OPCODE_TEXT, message, strlen(message));
 }
 
 // Arguments:
@@ -15,30 +16,32 @@ static void websocket_ready_handler(struct mg_connection *conn) {
 //          http://tools.ietf.org/html/rfc6455, section 5.2
 //   data, data_len: payload data. Mask, if any, is already applied.
 static int websocket_data_handler(struct mg_connection *conn, int flags,
-                                  char *data, size_t data_len) {
-  (void) flags; // Unused
-  mg_websocket_write(conn, WEBSOCKET_OPCODE_TEXT, data, data_len);
+                                  char *data, size_t data_len)
+{
+    (void) flags; // Unused
+    mg_websocket_write(conn, WEBSOCKET_OPCODE_TEXT, data, data_len);
 
-  // Returning zero means stoping websocket conversation.
-  // Close the conversation if client has sent us "exit" string.
-  return memcmp(data, "exit", 4);
+    // Returning zero means stoping websocket conversation.
+    // Close the conversation if client has sent us "exit" string.
+    return memcmp(data, "exit", 4);
 }
 
-int main(void) {
-  struct mg_context *ctx;
-  struct mg_callbacks callbacks;
-  const char *options[] = {
-    "listening_ports", "8080",
-    "document_root", "websocket_html_root",
-    NULL
-  };
+int main(void)
+{
+    struct mg_context *ctx;
+    struct mg_callbacks callbacks;
+    const char *options[] = {
+        "listening_ports", "8080",
+        "document_root", "websocket_html_root",
+        NULL
+    };
 
-  memset(&callbacks, 0, sizeof(callbacks));
-  callbacks.websocket_ready = websocket_ready_handler;
-  callbacks.websocket_data = websocket_data_handler;
-  ctx = mg_start(&callbacks, NULL, options);
-  getchar();  // Wait until user hits "enter"
-  mg_stop(ctx);
+    memset(&callbacks, 0, sizeof(callbacks));
+    callbacks.websocket_ready = websocket_ready_handler;
+    callbacks.websocket_data = websocket_data_handler;
+    ctx = mg_start(&callbacks, NULL, options);
+    getchar();  // Wait until user hits "enter"
+    mg_stop(ctx);
 
-  return 0;
+    return 0;
 }

include/CivetServer.h

@@ -17,7 +17,8 @@ class CivetServer; // forward declaration
  * Basic interface for a URI request handler.  Handlers implementations
  * must be reentrant.
  */
-class CivetHandler {
+class CivetHandler
+{
 public:
 
     /**
@@ -69,7 +70,8 @@ public:
  *
  * Basic class for embedded web server.  This has a URL mapping built-in.
  */
-class CivetServer {
+class CivetServer
+{
 public:
 
     /**
@@ -133,7 +135,7 @@ public:
 
     /**
      * getCookie(struct mg_connection *conn, const std::string &cookieName, std::string &cookieValue)
-     * @param conn - the connection information 
+     * @param conn - the connection information
      * @param cookieName - cookie name to get the value from
      * @param cookieValue - cookie value is returned using thiis reference
      * @puts the cookie value string that matches the cookie name in the _cookieValue string.
@@ -143,7 +145,7 @@ public:
 
     /**
      * getHeader(struct mg_connection *conn, const std::string &headerName)
-     * @param conn - the connection information 
+     * @param conn - the connection information
      * @param headerName - header name to get the value from
      * @returns a char array whcih contains the header value as string
     */
@@ -163,7 +165,7 @@ public:
      * @return true of key was found
      */
     static bool getParam(struct mg_connection *conn, const char *name,
-               std::string &dst, size_t occurrence=0);
+                         std::string &dst, size_t occurrence=0);
 
     /**
      * getParam(const std::string &, const char *, std::string &, size_t)
@@ -179,7 +181,7 @@ public:
      * @return true of key was found
      */
     static bool getParam(const std::string &data, const char *name,
-               std::string &dst, size_t occurrence=0) {
+                         std::string &dst, size_t occurrence=0) {
         return getParam(data.c_str(), data.length(), name, dst, occurrence);
     }
 
@@ -198,7 +200,7 @@ public:
      * @return true of key was found
      */
     static bool getParam(const char *data, size_t data_len, const char *name,
-               std::string &dst, size_t occurrence=0);
+                         std::string &dst, size_t occurrence=0);
 
 
     /**

include/civetweb.h

@@ -34,22 +34,22 @@ struct mg_connection;  // Handle for the individual connection
 
 // This structure contains information about the HTTP request.
 struct mg_request_info {
-  const char *request_method; // "GET", "POST", etc
-  const char *uri;            // URL-decoded URI
-  const char *http_version;   // E.g. "1.0", "1.1"
-  const char *query_string;   // URL part after '?', not including '?', or NULL
-  const char *remote_user;    // Authenticated user, or NULL if no auth used
-  long remote_ip;             // Client's IP address
-  int remote_port;            // Client's port
-  int is_ssl;                 // 1 if SSL-ed, 0 if not
-  void *user_data;            // User data pointer passed to mg_start()
-  void *conn_data;            // Connection-specific user data
-
-  int num_headers;            // Number of HTTP headers
-  struct mg_header {
-    const char *name;         // HTTP header name
-    const char *value;        // HTTP header value
-  } http_headers[64];         // Maximum 64 headers
+    const char *request_method; // "GET", "POST", etc
+    const char *uri;            // URL-decoded URI
+    const char *http_version;   // E.g. "1.0", "1.1"
+    const char *query_string;   // URL part after '?', not including '?', or NULL
+    const char *remote_user;    // Authenticated user, or NULL if no auth used
+    long remote_ip;             // Client's IP address
+    int remote_port;            // Client's port
+    int is_ssl;                 // 1 if SSL-ed, 0 if not
+    void *user_data;            // User data pointer passed to mg_start()
+    void *conn_data;            // Connection-specific user data
+
+    int num_headers;            // Number of HTTP headers
+    struct mg_header {
+        const char *name;         // HTTP header name
+        const char *value;        // HTTP header value
+    } http_headers[64];         // Maximum 64 headers
 };
 
 
@@ -57,78 +57,78 @@ struct mg_request_info {
 // which callbacks to invoke. For detailed description, see
 // https://github.com/sunsetbrew/civetweb/blob/master/docs/UserManual.md
 struct mg_callbacks {
-  // Called when civetweb has received new HTTP request.
-  // If callback returns non-zero,
-  // callback must process the request by sending valid HTTP headers and body,
-  // and civetweb will not do any further processing.
-  // If callback returns 0, civetweb processes the request itself. In this case,
-  // callback must not send any data to the client.
-  int  (*begin_request)(struct mg_connection *);
-
-  // Called when civetweb has finished processing request.
-  void (*end_request)(const struct mg_connection *, int reply_status_code);
-
-  // Called when civetweb is about to log a message. If callback returns
-  // non-zero, civetweb does not log anything.
-  int  (*log_message)(const struct mg_connection *, const char *message);
-
-  // Called when civetweb initializes SSL library.
-  int  (*init_ssl)(void *ssl_context, void *user_data);
-
-  // Called when websocket request is received, before websocket handshake.
-  // If callback returns 0, civetweb proceeds with handshake, otherwise
-  // cinnection is closed immediately.
-  int (*websocket_connect)(const struct mg_connection *);
-
-  // Called when websocket handshake is successfully completed, and
-  // connection is ready for data exchange.
-  void (*websocket_ready)(struct mg_connection *);
-
-  // Called when data frame has been received from the client.
-  // Parameters:
-  //    bits: first byte of the websocket frame, see websocket RFC at
-  //          http://tools.ietf.org/html/rfc6455, section 5.2
-  //    data, data_len: payload, with mask (if any) already applied.
-  // Return value:
-  //    non-0: keep this websocket connection opened.
-  //    0:     close this websocket connection.
-  int  (*websocket_data)(struct mg_connection *, int bits,
-                         char *data, size_t data_len);
-
-  // Called when civetweb is closing a connection.  The per-context mutex is locked when this
-  // is invoked.  This is primarily useful for noting when a websocket is closing and removing it
-  // from any application-maintained list of clients.
-  void (*connection_close)(struct mg_connection *);
-
-  // Called when civetweb tries to open a file. Used to intercept file open
-  // calls, and serve file data from memory instead.
-  // Parameters:
-  //    path:     Full path to the file to open.
-  //    data_len: Placeholder for the file size, if file is served from memory.
-  // Return value:
-  //    NULL: do not serve file from memory, proceed with normal file open.
-  //    non-NULL: pointer to the file contents in memory. data_len must be
-  //              initilized with the size of the memory block.
-  const char * (*open_file)(const struct mg_connection *,
-                             const char *path, size_t *data_len);
-
-  // Called when civetweb is about to serve Lua server page (.lp file), if
-  // Lua support is enabled.
-  // Parameters:
-  //   lua_context: "lua_State *" pointer.
-  void (*init_lua)(struct mg_connection *, void *lua_context);
-
-  // Called when civetweb has uploaded a file to a temporary directory as a
-  // result of mg_upload() call.
-  // Parameters:
-  //    file_file: full path name to the uploaded file.
-  void (*upload)(struct mg_connection *, const char *file_name);
-
-  // Called when civetweb is about to send HTTP error to the client.
-  // Implementing this callback allows to create custom error pages.
-  // Parameters:
-  //   status: HTTP error status code.
-  int  (*http_error)(struct mg_connection *, int status);
+    // Called when civetweb has received new HTTP request.
+    // If callback returns non-zero,
+    // callback must process the request by sending valid HTTP headers and body,
+    // and civetweb will not do any further processing.
+    // If callback returns 0, civetweb processes the request itself. In this case,
+    // callback must not send any data to the client.
+    int  (*begin_request)(struct mg_connection *);
+
+    // Called when civetweb has finished processing request.
+    void (*end_request)(const struct mg_connection *, int reply_status_code);
+
+    // Called when civetweb is about to log a message. If callback returns
+    // non-zero, civetweb does not log anything.
+    int  (*log_message)(const struct mg_connection *, const char *message);
+
+    // Called when civetweb initializes SSL library.
+    int  (*init_ssl)(void *ssl_context, void *user_data);
+
+    // Called when websocket request is received, before websocket handshake.
+    // If callback returns 0, civetweb proceeds with handshake, otherwise
+    // cinnection is closed immediately.
+    int (*websocket_connect)(const struct mg_connection *);
+
+    // Called when websocket handshake is successfully completed, and
+    // connection is ready for data exchange.
+    void (*websocket_ready)(struct mg_connection *);
+
+    // Called when data frame has been received from the client.
+    // Parameters:
+    //    bits: first byte of the websocket frame, see websocket RFC at
+    //          http://tools.ietf.org/html/rfc6455, section 5.2
+    //    data, data_len: payload, with mask (if any) already applied.
+    // Return value:
+    //    non-0: keep this websocket connection opened.
+    //    0:     close this websocket connection.
+    int  (*websocket_data)(struct mg_connection *, int bits,
+                           char *data, size_t data_len);
+
+    // Called when civetweb is closing a connection.  The per-context mutex is locked when this
+    // is invoked.  This is primarily useful for noting when a websocket is closing and removing it
+    // from any application-maintained list of clients.
+    void (*connection_close)(struct mg_connection *);
+
+    // Called when civetweb tries to open a file. Used to intercept file open
+    // calls, and serve file data from memory instead.
+    // Parameters:
+    //    path:     Full path to the file to open.
+    //    data_len: Placeholder for the file size, if file is served from memory.
+    // Return value:
+    //    NULL: do not serve file from memory, proceed with normal file open.
+    //    non-NULL: pointer to the file contents in memory. data_len must be
+    //              initilized with the size of the memory block.
+    const char * (*open_file)(const struct mg_connection *,
+                              const char *path, size_t *data_len);
+
+    // Called when civetweb is about to serve Lua server page (.lp file), if
+    // Lua support is enabled.
+    // Parameters:
+    //   lua_context: "lua_State *" pointer.
+    void (*init_lua)(struct mg_connection *, void *lua_context);
+
+    // Called when civetweb has uploaded a file to a temporary directory as a
+    // result of mg_upload() call.
+    // Parameters:
+    //    file_file: full path name to the uploaded file.
+    void (*upload)(struct mg_connection *, const char *file_name);
+
+    // Called when civetweb is about to send HTTP error to the client.
+    // Implementing this callback allows to create custom error pages.
+    // Parameters:
+    //   status: HTTP error status code.
+    int  (*http_error)(struct mg_connection *, int status);
 };
 
 // Start web server.
@@ -187,9 +187,9 @@ typedef int (* mg_request_handler)(struct mg_connection *conn, void *cbdata);
 //
 // URI's are ordered and prefixed URI's are supported. For example,
 // consider two URIs: /a/b and /a
-//         /a   matches /a 
+//         /a   matches /a
 //         /a/b matches /a/b
-//         /a/c matches /a  
+//         /a/c matches /a
 //
 // Parameters:
 //    ctx: server context
@@ -268,12 +268,12 @@ void mg_unlock(struct mg_connection* conn);
 
 // Opcodes, from http://tools.ietf.org/html/rfc6455
 enum {
-  WEBSOCKET_OPCODE_CONTINUATION = 0x0,
-  WEBSOCKET_OPCODE_TEXT = 0x1,
-  WEBSOCKET_OPCODE_BINARY = 0x2,
-  WEBSOCKET_OPCODE_CONNECTION_CLOSE = 0x8,
-  WEBSOCKET_OPCODE_PING = 0x9,
-  WEBSOCKET_OPCODE_PONG = 0xa
+    WEBSOCKET_OPCODE_CONTINUATION = 0x0,
+    WEBSOCKET_OPCODE_TEXT = 0x1,
+    WEBSOCKET_OPCODE_BINARY = 0x2,
+    WEBSOCKET_OPCODE_CONNECTION_CLOSE = 0x8,
+    WEBSOCKET_OPCODE_PING = 0x9,
+    WEBSOCKET_OPCODE_PONG = 0xa
 };
 
 
@@ -368,7 +368,7 @@ int mg_get_var(const char *data, size_t data_len,
 // Destination buffer is guaranteed to be '\0' - terminated if it is not
 // NULL or zero length.
 int mg_get_var2(const char *data, size_t data_len,
-               const char *var_name, char *dst, size_t dst_len, size_t occurrence);
+                const char *var_name, char *dst, size_t dst_len, size_t occurrence);
 
 // Fetch value of certain cookie variable into the destination buffer.
 //
@@ -462,7 +462,7 @@ char *mg_md5(char buf[33], ...);
 // Example:
 //   mg_cry(conn,"i like %s", "logging");
 void mg_cry(struct mg_connection *conn,
-                PRINTF_FORMAT_STRING(const char *fmt), ...) PRINTF_ARGS(2, 3);
+            PRINTF_FORMAT_STRING(const char *fmt), ...) PRINTF_ARGS(2, 3);
 
 // utility method to compare two buffers, case incensitive.
 int mg_strncasecmp(const char *s1, const char *s2, size_t len);

src/CivetServer.cpp

@@ -10,34 +10,39 @@
 #include <assert.h>
 
 #ifndef UNUSED_PARAMETER
- #define UNUSED_PARAMETER(x) (void)(x)
+#define UNUSED_PARAMETER(x) (void)(x)
 #endif
 
-bool CivetHandler::handleGet(CivetServer *server, struct mg_connection *conn) {
+bool CivetHandler::handleGet(CivetServer *server, struct mg_connection *conn)
+{
     UNUSED_PARAMETER(server);
     UNUSED_PARAMETER(conn);
     return false;
 }
 
-bool CivetHandler::handlePost(CivetServer *server, struct mg_connection *conn) {
+bool CivetHandler::handlePost(CivetServer *server, struct mg_connection *conn)
+{
     UNUSED_PARAMETER(server);
     UNUSED_PARAMETER(conn);
     return false;
 }
 
-bool CivetHandler::handlePut(CivetServer *server, struct mg_connection *conn) {
+bool CivetHandler::handlePut(CivetServer *server, struct mg_connection *conn)
+{
     UNUSED_PARAMETER(server);
     UNUSED_PARAMETER(conn);
     return false;
 }
 
-bool CivetHandler::handleDelete(CivetServer *server, struct mg_connection *conn) {
+bool CivetHandler::handleDelete(CivetServer *server, struct mg_connection *conn)
+{
     UNUSED_PARAMETER(server);
     UNUSED_PARAMETER(conn);
     return false;
 }
 
-int CivetServer::requestHandler(struct mg_connection *conn, void *cbdata) {
+int CivetServer::requestHandler(struct mg_connection *conn, void *cbdata)
+{
     struct mg_request_info *request_info = mg_get_request_info(conn);
     CivetServer *me = (CivetServer*) (request_info->user_data);
     CivetHandler *handler = (CivetHandler *)cbdata;
@@ -59,8 +64,9 @@ int CivetServer::requestHandler(struct mg_connection *conn, void *cbdata) {
 }
 
 CivetServer::CivetServer(const char **options,
-        const struct mg_callbacks *_callbacks) :
-        context(0) {
+                         const struct mg_callbacks *_callbacks) :
+    context(0)
+{
 
 
     if (_callbacks) {
@@ -72,19 +78,23 @@ CivetServer::CivetServer(const char **options,
     }
 }
 
-CivetServer::~CivetServer() {
+CivetServer::~CivetServer()
+{
     close();
 }
 
-void CivetServer::addHandler(const std::string &uri, CivetHandler *handler) {
+void CivetServer::addHandler(const std::string &uri, CivetHandler *handler)
+{
     mg_set_request_handler(context, uri.c_str(), requestHandler, handler);
 }
 
-void CivetServer::removeHandler(const std::string &uri) {
+void CivetServer::removeHandler(const std::string &uri)
+{
     mg_set_request_handler(context, uri.c_str(), NULL, NULL);
 }
 
-void CivetServer::close() {
+void CivetServer::close()
+{
     if (context) {
         mg_stop (context);
         context = 0;
@@ -108,96 +118,102 @@ const char* CivetServer::getHeader(struct mg_connection *conn, const std::string
 }
 
 void
-CivetServer::urlDecode(const char *src, std::string &dst, bool is_form_url_encoded) {
+CivetServer::urlDecode(const char *src, std::string &dst, bool is_form_url_encoded)
+{
     urlDecode(src, strlen(src), dst, is_form_url_encoded);
 }
 
 void
-CivetServer::urlDecode(const char *src, size_t src_len, std::string &dst, bool is_form_url_encoded) {
-  int i, j, a, b;
+CivetServer::urlDecode(const char *src, size_t src_len, std::string &dst, bool is_form_url_encoded)
+{
+    int i, j, a, b;
 #define HEXTOI(x) (isdigit(x) ? x - '0' : x - 'W')
 
-  dst.clear();
-  for (i = j = 0; i < (int)src_len; i++, j++) {
-    if (src[i] == '%' && i < (int)src_len - 2 &&
-        isxdigit(* (const unsigned char *) (src + i + 1)) &&
-        isxdigit(* (const unsigned char *) (src + i + 2))) {
-      a = tolower(* (const unsigned char *) (src + i + 1));
-      b = tolower(* (const unsigned char *) (src + i + 2));
-      dst.push_back((char) ((HEXTOI(a) << 4) | HEXTOI(b)));
-      i += 2;
-    } else if (is_form_url_encoded && src[i] == '+') {
-      dst.push_back(' ');
-    } else {
-      dst.push_back(src[i]);
+    dst.clear();
+    for (i = j = 0; i < (int)src_len; i++, j++) {
+        if (src[i] == '%' && i < (int)src_len - 2 &&
+            isxdigit(* (const unsigned char *) (src + i + 1)) &&
+            isxdigit(* (const unsigned char *) (src + i + 2))) {
+            a = tolower(* (const unsigned char *) (src + i + 1));
+            b = tolower(* (const unsigned char *) (src + i + 2));
+            dst.push_back((char) ((HEXTOI(a) << 4) | HEXTOI(b)));
+            i += 2;
+        } else if (is_form_url_encoded && src[i] == '+') {
+            dst.push_back(' ');
+        } else {
+            dst.push_back(src[i]);
+        }
     }
-  }
 }
 
 bool
 CivetServer::getParam(struct mg_connection *conn, const char *name,
-               std::string &dst, size_t occurrence) {
-        const char *query = mg_get_request_info(conn)->query_string;
-        return getParam(query, strlen(query), name, dst, occurrence);
+                      std::string &dst, size_t occurrence)
+{
+    const char *query = mg_get_request_info(conn)->query_string;
+    return getParam(query, strlen(query), name, dst, occurrence);
 }
 
 bool
 CivetServer::getParam(const char *data, size_t data_len, const char *name,
-               std::string &dst, size_t occurrence) {
-  const char *p, *e, *s;
-  size_t name_len;
-
-  dst.clear();
-  if (data == NULL || name == NULL || data_len == 0) {
-      return false;
-  }
-  name_len = strlen(name);
-  e = data + data_len;
-
-  // data is "var1=val1&var2=val2...". Find variable first
-  for (p = data; p + name_len < e; p++) {
-    if ((p == data || p[-1] == '&') && p[name_len] == '=' &&
-        !mg_strncasecmp(name, p, name_len) && 0 == occurrence--) {
-
-      // Point p to variable value
-      p += name_len + 1;
-
-      // Point s to the end of the value
-      s = (const char *) memchr(p, '&', (size_t)(e - p));
-      if (s == NULL) {
-        s = e;
-      }
-      assert(s >= p);
-
-      // Decode variable into destination buffer
-      urlDecode(p, (int)(s - p), dst, true);
-      return true;
+                      std::string &dst, size_t occurrence)
+{
+    const char *p, *e, *s;
+    size_t name_len;
+
+    dst.clear();
+    if (data == NULL || name == NULL || data_len == 0) {
+        return false;
     }
-  }
-  return false;
+    name_len = strlen(name);
+    e = data + data_len;
+
+    // data is "var1=val1&var2=val2...". Find variable first
+    for (p = data; p + name_len < e; p++) {
+        if ((p == data || p[-1] == '&') && p[name_len] == '=' &&
+            !mg_strncasecmp(name, p, name_len) && 0 == occurrence--) {
+
+            // Point p to variable value
+            p += name_len + 1;
+
+            // Point s to the end of the value
+            s = (const char *) memchr(p, '&', (size_t)(e - p));
+            if (s == NULL) {
+                s = e;
+            }
+            assert(s >= p);
+
+            // Decode variable into destination buffer
+            urlDecode(p, (int)(s - p), dst, true);
+            return true;
+        }
+    }
+    return false;
 }
 
 void
-CivetServer::urlEncode(const char *src, std::string &dst, bool append) {
+CivetServer::urlEncode(const char *src, std::string &dst, bool append)
+{
     urlEncode(src, strlen(src), dst, append);
 }
 
 void
-CivetServer::urlEncode(const char *src, size_t src_len, std::string &dst, bool append) {
-  static const char *dont_escape = "._-$,;~()";
-  static const char *hex = "0123456789abcdef";
-
-  if (!append)
-      dst.clear();
-
-  for (; src_len > 0; src++, src_len--) {
-    if (isalnum(*(const unsigned char *) src) ||
-        strchr(dont_escape, * (const unsigned char *) src) != NULL) {
-      dst.push_back(*src);
-    } else {
-      dst.push_back('%');
-      dst.push_back(hex[(* (const unsigned char *) src) >> 4]);
-      dst.push_back(hex[(* (const unsigned char *) src) & 0xf]);
+CivetServer::urlEncode(const char *src, size_t src_len, std::string &dst, bool append)
+{
+    static const char *dont_escape = "._-$,;~()";
+    static const char *hex = "0123456789abcdef";
+
+    if (!append)
+        dst.clear();
+
+    for (; src_len > 0; src++, src_len--) {
+        if (isalnum(*(const unsigned char *) src) ||
+            strchr(dont_escape, * (const unsigned char *) src) != NULL) {
+            dst.push_back(*src);
+        } else {
+            dst.push_back('%');
+            dst.push_back(hex[(* (const unsigned char *) src) >> 4]);
+            dst.push_back(hex[(* (const unsigned char *) src) & 0xf]);
+        }
     }
-  }
 }

src/main.c

@@ -81,341 +81,356 @@ static struct mg_context *ctx;      // Set by start_civetweb()
 #define CONFIG_FILE2 "/usr/local/etc/civetweb.conf"
 #endif
 
-static void WINCDECL signal_handler(int sig_num) {
-  exit_flag = sig_num;
+static void WINCDECL signal_handler(int sig_num)
+{
+    exit_flag = sig_num;
 }
 
-static void die(const char *fmt, ...) {
-  va_list ap;
-  char msg[200];
+static void die(const char *fmt, ...)
+{
+    va_list ap;
+    char msg[200];
 
-  va_start(ap, fmt);
-  vsnprintf(msg, sizeof(msg), fmt, ap);
-  va_end(ap);
+    va_start(ap, fmt);
+    vsnprintf(msg, sizeof(msg), fmt, ap);
+    va_end(ap);
 
 #if defined(_WIN32)
-  MessageBox(NULL, msg, "Error", MB_OK);
+    MessageBox(NULL, msg, "Error", MB_OK);
 #else
-  fprintf(stderr, "%s\n", msg);
+    fprintf(stderr, "%s\n", msg);
 #endif
 
-  exit(EXIT_FAILURE);
+    exit(EXIT_FAILURE);
 }
 
-static void show_usage_and_exit(void) {
-  const char **names;
-  int i;
+static void show_usage_and_exit(void)
+{
+    const char **names;
+    int i;
 
-  fprintf(stderr, "Civetweb v%s, built on %s\n",
-          mg_version(), __DATE__);
-  fprintf(stderr, "Usage:\n");
-  fprintf(stderr, "  civetweb -A <htpasswd_file> <realm> <user> <passwd>\n");
-  fprintf(stderr, "  civetweb [config_file]\n");
-  fprintf(stderr, "  civetweb [-option value ...]\n");
-  fprintf(stderr, "\nOPTIONS:\n");
+    fprintf(stderr, "Civetweb v%s, built on %s\n",
+            mg_version(), __DATE__);
+    fprintf(stderr, "Usage:\n");
+    fprintf(stderr, "  civetweb -A <htpasswd_file> <realm> <user> <passwd>\n");
+    fprintf(stderr, "  civetweb [config_file]\n");
+    fprintf(stderr, "  civetweb [-option value ...]\n");
+    fprintf(stderr, "\nOPTIONS:\n");
 
-  names = mg_get_valid_option_names();
-  for (i = 0; names[i] != NULL; i += 2) {
-    fprintf(stderr, "  -%s %s\n",
-            names[i], names[i + 1] == NULL ? "<empty>" : names[i + 1]);
-  }
-  exit(EXIT_FAILURE);
+    names = mg_get_valid_option_names();
+    for (i = 0; names[i] != NULL; i += 2) {
+        fprintf(stderr, "  -%s %s\n",
+                names[i], names[i + 1] == NULL ? "<empty>" : names[i + 1]);
+    }
+    exit(EXIT_FAILURE);
 }
 
 #if defined(_WIN32) || defined(USE_COCOA)
 static const char *config_file_top_comment =
-"# Civetweb web server configuration file.\n"
-"# For detailed description of every option, visit\n"
-"# https://github.com/sunsetbrew/civetweb/blob/master/docs/UserManual.md\n"
-"# Lines starting with '#' and empty lines are ignored.\n"
-"# To make a change, remove leading '#', modify option's value,\n"
-"# save this file and then restart Civetweb.\n\n";
-
-static const char *get_url_to_first_open_port(const struct mg_context *ctx) {
-  static char url[100];
-  const char *open_ports = mg_get_option(ctx, "listening_ports");
-  int a, b, c, d, port, n;
-
-  if (sscanf(open_ports, "%d.%d.%d.%d:%d%n", &a, &b, &c, &d, &port, &n) == 5) {
-    snprintf(url, sizeof(url), "%s://%d.%d.%d.%d:%d",
-             open_ports[n] == 's' ? "https" : "http", a, b, c, d, port);
-  } else if (sscanf(open_ports, "%d%n", &port, &n) == 1) {
-    snprintf(url, sizeof(url), "%s://localhost:%d",
-             open_ports[n] == 's' ? "https" : "http", port);
-  } else {
-    snprintf(url, sizeof(url), "%s", "http://localhost:8080");
-  }
-
-  return url;
-}
-
-static void create_config_file(const char *path) {
-  const char **names, *value;
-  FILE *fp;
-  int i;
-
-  // Create config file if it is not present yet
-  if ((fp = fopen(path, "r")) != NULL) {
-    fclose(fp);
-  } else if ((fp = fopen(path, "a+")) != NULL) {
-    fprintf(fp, "%s", config_file_top_comment);
-    names = mg_get_valid_option_names();
-    for (i = 0; names[i * 2] != NULL; i++) {
-      value = mg_get_option(ctx, names[i * 2]);
-      fprintf(fp, "# %s %s\n", names[i * 2], value ? value : "<value>");
+    "# Civetweb web server configuration file.\n"
+    "# For detailed description of every option, visit\n"
+    "# https://github.com/sunsetbrew/civetweb/blob/master/docs/UserManual.md\n"
+    "# Lines starting with '#' and empty lines are ignored.\n"
+    "# To make a change, remove leading '#', modify option's value,\n"
+    "# save this file and then restart Civetweb.\n\n";
+
+static const char *get_url_to_first_open_port(const struct mg_context *ctx)
+{
+    static char url[100];
+    const char *open_ports = mg_get_option(ctx, "listening_ports");
+    int a, b, c, d, port, n;
+
+    if (sscanf(open_ports, "%d.%d.%d.%d:%d%n", &a, &b, &c, &d, &port, &n) == 5) {
+        snprintf(url, sizeof(url), "%s://%d.%d.%d.%d:%d",
+                 open_ports[n] == 's' ? "https" : "http", a, b, c, d, port);
+    } else if (sscanf(open_ports, "%d%n", &port, &n) == 1) {
+        snprintf(url, sizeof(url), "%s://localhost:%d",
+                 open_ports[n] == 's' ? "https" : "http", port);
+    } else {
+        snprintf(url, sizeof(url), "%s", "http://localhost:8080");
     }
-    fclose(fp);
-  }
+
+    return url;
 }
-#endif
 
-static char *sdup(const char *str) {
-  char *p;
-  if ((p = (char *) malloc(strlen(str) + 1)) != NULL) {
-    strcpy(p, str);
-  }
-  return p;
-}
-
-static void set_option(char **options, const char *name, const char *value) {
-  int i;
-
-  for (i = 0; i < MAX_OPTIONS - 3; i++) {
-    if (options[i] == NULL) {
-      options[i] = sdup(name);
-      options[i + 1] = sdup(value);
-      options[i + 2] = NULL;
-      break;
-    } else if (!strcmp(options[i], name)) {
-      free(options[i + 1]);
-      options[i + 1] = sdup(value);
-      break;
+static void create_config_file(const char *path)
+{
+    const char **names, *value;
+    FILE *fp;
+    int i;
+
+    // Create config file if it is not present yet
+    if ((fp = fopen(path, "r")) != NULL) {
+        fclose(fp);
+    } else if ((fp = fopen(path, "a+")) != NULL) {
+        fprintf(fp, "%s", config_file_top_comment);
+        names = mg_get_valid_option_names();
+        for (i = 0; names[i * 2] != NULL; i++) {
+            value = mg_get_option(ctx, names[i * 2]);
+            fprintf(fp, "# %s %s\n", names[i * 2], value ? value : "<value>");
+        }
+        fclose(fp);
     }
-  }
+}
+#endif
 
-  if (i == MAX_OPTIONS - 3) {
-    die("%s", "Too many options specified");
-  }
+static char *sdup(const char *str)
+{
+    char *p;
+    if ((p = (char *) malloc(strlen(str) + 1)) != NULL) {
+        strcpy(p, str);
+    }
+    return p;
 }
 
-static void process_command_line_arguments(char *argv[], char **options) {
-  char line[MAX_CONF_FILE_LINE_SIZE], opt[sizeof(line)], val[sizeof(line)], *p;
-  FILE *fp = NULL;
-  size_t i, cmd_line_opts_start = 1, line_no = 0;
+static void set_option(char **options, const char *name, const char *value)
+{
+    int i;
+
+    for (i = 0; i < MAX_OPTIONS - 3; i++) {
+        if (options[i] == NULL) {
+            options[i] = sdup(name);
+            options[i + 1] = sdup(value);
+            options[i + 2] = NULL;
+            break;
+        } else if (!strcmp(options[i], name)) {
+            free(options[i + 1]);
+            options[i + 1] = sdup(value);
+            break;
+        }
+    }
 
-  // Should we use a config file ?
-  if (argv[1] != NULL && argv[1][0] != '-') {
-    snprintf(config_file, sizeof(config_file), "%s", argv[1]);
-    cmd_line_opts_start = 2;
-  } else if ((p = strrchr(argv[0], DIRSEP)) == NULL) {
-    // No command line flags specified. Look where binary lives
-    snprintf(config_file, sizeof(config_file), "%s", CONFIG_FILE);
-  } else {
-    snprintf(config_file, sizeof(config_file), "%.*s%c%s",
-             (int) (p - argv[0]), argv[0], DIRSEP, CONFIG_FILE);
-  }
+    if (i == MAX_OPTIONS - 3) {
+        die("%s", "Too many options specified");
+    }
+}
 
-  fp = fopen(config_file, "r");
+static void process_command_line_arguments(char *argv[], char **options)
+{
+    char line[MAX_CONF_FILE_LINE_SIZE], opt[sizeof(line)], val[sizeof(line)], *p;
+    FILE *fp = NULL;
+    size_t i, cmd_line_opts_start = 1, line_no = 0;
+
+    // Should we use a config file ?
+    if (argv[1] != NULL && argv[1][0] != '-') {
+        snprintf(config_file, sizeof(config_file), "%s", argv[1]);
+        cmd_line_opts_start = 2;
+    } else if ((p = strrchr(argv[0], DIRSEP)) == NULL) {
+        // No command line flags specified. Look where binary lives
+        snprintf(config_file, sizeof(config_file), "%s", CONFIG_FILE);
+    } else {
+        snprintf(config_file, sizeof(config_file), "%.*s%c%s",
+                 (int) (p - argv[0]), argv[0], DIRSEP, CONFIG_FILE);
+    }
 
-  // If config file was set in command line and open failed, die
-  if (cmd_line_opts_start == 2 && fp == NULL) {
-    die("Cannot open config file %s: %s", config_file, strerror(errno));
-  }
+    fp = fopen(config_file, "r");
+
+    // If config file was set in command line and open failed, die
+    if (cmd_line_opts_start == 2 && fp == NULL) {
+        die("Cannot open config file %s: %s", config_file, strerror(errno));
+    }
 
 #ifdef CONFIG_FILE2
-  // try alternate config file
-  if (fp == NULL) {
-    fp = fopen(CONFIG_FILE2, "r");
-    if (fp != NULL) {
-	strcpy(config_file, CONFIG_FILE2);
+    // try alternate config file
+    if (fp == NULL) {
+        fp = fopen(CONFIG_FILE2, "r");
+        if (fp != NULL) {
+            strcpy(config_file, CONFIG_FILE2);
+        }
     }
-  }
 #endif
 
-  // Load config file settings first
-  if (fp != NULL) {
-    fprintf(stderr, "Loading config file %s\n", config_file);
-
-    // Loop over the lines in config file
-    while (fgets(line, sizeof(line), fp) != NULL) {
-      line_no++;
-
-      // Ignore empty lines and comments
-      for (i = 0; isspace(* (unsigned char *) &line[i]); ) i++;
-      if (line[i] == '#' || line[i] == '\0') {
-        continue;
-      }
-
-      if (sscanf(line, "%s %[^\r\n#]", opt, val) != 2) {
-        printf("%s: line %d is invalid, ignoring it:\n %s",
-               config_file, (int) line_no, line);
-      } else {
-        set_option(options, opt, val);
-      }
+    // Load config file settings first
+    if (fp != NULL) {
+        fprintf(stderr, "Loading config file %s\n", config_file);
+
+        // Loop over the lines in config file
+        while (fgets(line, sizeof(line), fp) != NULL) {
+            line_no++;
+
+            // Ignore empty lines and comments
+            for (i = 0; isspace(* (unsigned char *) &line[i]); ) i++;
+            if (line[i] == '#' || line[i] == '\0') {
+                continue;
+            }
+
+            if (sscanf(line, "%s %[^\r\n#]", opt, val) != 2) {
+                printf("%s: line %d is invalid, ignoring it:\n %s",
+                       config_file, (int) line_no, line);
+            } else {
+                set_option(options, opt, val);
+            }
+        }
+
+        (void) fclose(fp);
     }
 
-    (void) fclose(fp);
-  }
-
-  // If we're under MacOS and started by launchd, then the second
-  // argument is process serial number, -psn_.....
-  // In this case, don't process arguments at all.
-  if (argv[1] == NULL || memcmp(argv[1], "-psn_", 5) != 0) {
-    // Handle command line flags.
-    // They override config file and default settings.
-    for (i = cmd_line_opts_start; argv[i] != NULL; i += 2) {
-      if (argv[i][0] != '-' || argv[i + 1] == NULL) {
-        show_usage_and_exit();
-      }
-      set_option(options, &argv[i][1], argv[i + 1]);
+    // If we're under MacOS and started by launchd, then the second
+    // argument is process serial number, -psn_.....
+    // In this case, don't process arguments at all.
+    if (argv[1] == NULL || memcmp(argv[1], "-psn_", 5) != 0) {
+        // Handle command line flags.
+        // They override config file and default settings.
+        for (i = cmd_line_opts_start; argv[i] != NULL; i += 2) {
+            if (argv[i][0] != '-' || argv[i + 1] == NULL) {
+                show_usage_and_exit();
+            }
+            set_option(options, &argv[i][1], argv[i + 1]);
+        }
     }
-  }
 }
 
-static void init_server_name(void) {
-  snprintf(server_name, sizeof(server_name), "Civetweb v%s",
-           mg_version());
+static void init_server_name(void)
+{
+    snprintf(server_name, sizeof(server_name), "Civetweb v%s",
+             mg_version());
 }
 
-static int log_message(const struct mg_connection *conn, const char *message) {
-  (void) conn;
-  printf("%s\n", message);
-  return 0;
+static int log_message(const struct mg_connection *conn, const char *message)
+{
+    (void) conn;
+    printf("%s\n", message);
+    return 0;
 }
 
-static int is_path_absolute(const char *path) {
+static int is_path_absolute(const char *path)
+{
 #ifdef _WIN32
-  return path != NULL &&
-    ((path[0] == '\\' && path[1] == '\\') ||  // UNC path, e.g. \\server\dir
-     (isalpha(path[0]) && path[1] == ':' && path[2] == '\\'));  // E.g. X:\dir
+    return path != NULL &&
+           ((path[0] == '\\' && path[1] == '\\') ||  // UNC path, e.g. \\server\dir
+            (isalpha(path[0]) && path[1] == ':' && path[2] == '\\'));  // E.g. X:\dir
 #else
-  return path != NULL && path[0] == '/';
+    return path != NULL && path[0] == '/';
 #endif
 }
 
-static char *get_option(char **options, const char *option_name) {
-  int i;
+static char *get_option(char **options, const char *option_name)
+{
+    int i;
 
-  for (i = 0; options[i] != NULL; i++)
-    if (!strcmp(options[i], option_name))
-      return options[i + 1];
+    for (i = 0; options[i] != NULL; i++)
+        if (!strcmp(options[i], option_name))
+            return options[i + 1];
 
-  return NULL;
+    return NULL;
 }
 
 static void verify_existence(char **options, const char *option_name,
-                             int must_be_dir) {
-  struct stat st;
-  const char *path = get_option(options, option_name);
-
-  if (path != NULL && (stat(path, &st) != 0 ||
-                       ((S_ISDIR(st.st_mode) ? 1 : 0) != must_be_dir))) {
-    die("Invalid path for %s: [%s]: (%s). Make sure that path is either "
-        "absolute, or it is relative to civetweb executable.",
-        option_name, path, strerror(errno));
-  }
+                             int must_be_dir)
+{
+    struct stat st;
+    const char *path = get_option(options, option_name);
+
+    if (path != NULL && (stat(path, &st) != 0 ||
+                         ((S_ISDIR(st.st_mode) ? 1 : 0) != must_be_dir))) {
+        die("Invalid path for %s: [%s]: (%s). Make sure that path is either "
+            "absolute, or it is relative to civetweb executable.",
+            option_name, path, strerror(errno));
+    }
 }
 
 static void set_absolute_path(char *options[], const char *option_name,
-                              const char *path_to_civetweb_exe) {
-  char path[PATH_MAX], abs[PATH_MAX], *option_value;
-  const char *p;
-
-  // Check whether option is already set
-  option_value = get_option(options, option_name);
-
-  // If option is already set and it is an absolute path,
-  // leave it as it is -- it's already absolute.
-  if (option_value != NULL && !is_path_absolute(option_value)) {
-    // Not absolute. Use the directory where civetweb executable lives
-    // be the relative directory for everything.
-    // Extract civetweb executable directory into path.
-    if ((p = strrchr(path_to_civetweb_exe, DIRSEP)) == NULL) {
-      getcwd(path, sizeof(path));
-    } else {
-      snprintf(path, sizeof(path), "%.*s", (int) (p - path_to_civetweb_exe),
-               path_to_civetweb_exe);
-    }
+                              const char *path_to_civetweb_exe)
+{
+    char path[PATH_MAX], abs[PATH_MAX], *option_value;
+    const char *p;
+
+    // Check whether option is already set
+    option_value = get_option(options, option_name);
+
+    // If option is already set and it is an absolute path,
+    // leave it as it is -- it's already absolute.
+    if (option_value != NULL && !is_path_absolute(option_value)) {
+        // Not absolute. Use the directory where civetweb executable lives
+        // be the relative directory for everything.
+        // Extract civetweb executable directory into path.
+        if ((p = strrchr(path_to_civetweb_exe, DIRSEP)) == NULL) {
+            getcwd(path, sizeof(path));
+        } else {
+            snprintf(path, sizeof(path), "%.*s", (int) (p - path_to_civetweb_exe),
+                     path_to_civetweb_exe);
+        }
 
-    strncat(path, "/", sizeof(path) - 1);
-    strncat(path, option_value, sizeof(path) - 1);
+        strncat(path, "/", sizeof(path) - 1);
+        strncat(path, option_value, sizeof(path) - 1);
 
-    // Absolutize the path, and set the option
-    abs_path(path, abs, sizeof(abs));
-    set_option(options, option_name, abs);
-  }
+        // Absolutize the path, and set the option
+        abs_path(path, abs, sizeof(abs));
+        set_option(options, option_name, abs);
+    }
 }
 
-static void start_civetweb(int argc, char *argv[]) {
-  struct mg_callbacks callbacks;
-  char *options[MAX_OPTIONS];
-  int i;
+static void start_civetweb(int argc, char *argv[])
+{
+    struct mg_callbacks callbacks;
+    char *options[MAX_OPTIONS];
+    int i;
 
-  // Edit passwords file if -A option is specified
-  if (argc > 1 && !strcmp(argv[1], "-A")) {
-    if (argc != 6) {
-      show_usage_and_exit();
+    // Edit passwords file if -A option is specified
+    if (argc > 1 && !strcmp(argv[1], "-A")) {
+        if (argc != 6) {
+            show_usage_and_exit();
+        }
+        exit(mg_modify_passwords_file(argv[2], argv[3], argv[4], argv[5]) ?
+             EXIT_SUCCESS : EXIT_FAILURE);
+    }
+
+    // Show usage if -h or --help options are specified
+    if (argc == 2 && (!strcmp(argv[1], "-h") || !strcmp(argv[1], "--help"))) {
+        show_usage_and_exit();
+    }
+
+    options[0] = NULL;
+    set_option(options, "document_root", ".");
+
+    // Update config based on command line arguments
+    process_command_line_arguments(argv, options);
+
+    // Make sure we have absolute paths for files and directories
+    set_absolute_path(options, "document_root", argv[0]);
+    set_absolute_path(options, "put_delete_auth_file", argv[0]);
+    set_absolute_path(options, "cgi_interpreter", argv[0]);
+    set_absolute_path(options, "access_log_file", argv[0]);
+    set_absolute_path(options, "error_log_file", argv[0]);
+    set_absolute_path(options, "global_auth_file", argv[0]);
+    set_absolute_path(options, "ssl_certificate", argv[0]);
+
+    // Make extra verification for certain options
+    verify_existence(options, "document_root", 1);
+    verify_existence(options, "cgi_interpreter", 0);
+    verify_existence(options, "ssl_certificate", 0);
+
+    // Setup signal handler: quit on Ctrl-C
+    signal(SIGTERM, signal_handler);
+    signal(SIGINT, signal_handler);
+
+    // Start Civetweb
+    memset(&callbacks, 0, sizeof(callbacks));
+    callbacks.log_message = &log_message;
+    ctx = mg_start(&callbacks, NULL, (const char **) options);
+    for (i = 0; options[i] != NULL; i++) {
+        free(options[i]);
+    }
+
+    if (ctx == NULL) {
+        die("%s", "Failed to start Civetweb.");
     }
-    exit(mg_modify_passwords_file(argv[2], argv[3], argv[4], argv[5]) ?
-         EXIT_SUCCESS : EXIT_FAILURE);
-  }
-
-  // Show usage if -h or --help options are specified
-  if (argc == 2 && (!strcmp(argv[1], "-h") || !strcmp(argv[1], "--help"))) {
-    show_usage_and_exit();
-  }
-
-  options[0] = NULL;
-  set_option(options, "document_root", ".");
-
-  // Update config based on command line arguments
-  process_command_line_arguments(argv, options);
-
-  // Make sure we have absolute paths for files and directories
-  set_absolute_path(options, "document_root", argv[0]);
-  set_absolute_path(options, "put_delete_auth_file", argv[0]);
-  set_absolute_path(options, "cgi_interpreter", argv[0]);
-  set_absolute_path(options, "access_log_file", argv[0]);
-  set_absolute_path(options, "error_log_file", argv[0]);
-  set_absolute_path(options, "global_auth_file", argv[0]);
-  set_absolute_path(options, "ssl_certificate", argv[0]);
-
-  // Make extra verification for certain options
-  verify_existence(options, "document_root", 1);
-  verify_existence(options, "cgi_interpreter", 0);
-  verify_existence(options, "ssl_certificate", 0);
-
-  // Setup signal handler: quit on Ctrl-C
-  signal(SIGTERM, signal_handler);
-  signal(SIGINT, signal_handler);
-
-  // Start Civetweb
-  memset(&callbacks, 0, sizeof(callbacks));
-  callbacks.log_message = &log_message;
-  ctx = mg_start(&callbacks, NULL, (const char **) options);
-  for (i = 0; options[i] != NULL; i++) {
-    free(options[i]);
-  }
-
-  if (ctx == NULL) {
-    die("%s", "Failed to start Civetweb.");
-  }
 }
 
 #ifdef _WIN32
 enum {
-  ID_ICON = 100, ID_QUIT, ID_SETTINGS, ID_SEPARATOR, ID_INSTALL_SERVICE,
-  ID_REMOVE_SERVICE, ID_STATIC, ID_GROUP, ID_SAVE, ID_RESET_DEFAULTS,
-  ID_STATUS, ID_CONNECT,
-
-  // All dynamically created text boxes for options have IDs starting from
-  // ID_CONTROLS, incremented by one.
-  ID_CONTROLS = 200,
-
-  // Text boxes for files have "..." buttons to open file browser. These
-  // buttons have IDs that are ID_FILE_BUTTONS_DELTA higher than associated
-  // text box ID.
-  ID_FILE_BUTTONS_DELTA = 1000
+    ID_ICON = 100, ID_QUIT, ID_SETTINGS, ID_SEPARATOR, ID_INSTALL_SERVICE,
+    ID_REMOVE_SERVICE, ID_STATIC, ID_GROUP, ID_SAVE, ID_RESET_DEFAULTS,
+    ID_STATUS, ID_CONNECT,
+
+    // All dynamically created text boxes for options have IDs starting from
+    // ID_CONTROLS, incremented by one.
+    ID_CONTROLS = 200,
+
+    // Text boxes for files have "..." buttons to open file browser. These
+    // buttons have IDs that are ID_FILE_BUTTONS_DELTA higher than associated
+    // text box ID.
+    ID_FILE_BUTTONS_DELTA = 1000
 };
 static HICON hIcon;
 static SERVICE_STATUS ss;
@@ -423,569 +438,590 @@ static SERVICE_STATUS_HANDLE hStatus;
 static const char *service_magic_argument = "--";
 static NOTIFYICONDATA TrayIcon;
 
-static void WINAPI ControlHandler(DWORD code) {
-  if (code == SERVICE_CONTROL_STOP || code == SERVICE_CONTROL_SHUTDOWN) {
-    ss.dwWin32ExitCode = 0;
-    ss.dwCurrentState = SERVICE_STOPPED;
-  }
-  SetServiceStatus(hStatus, &ss);
+static void WINAPI ControlHandler(DWORD code)
+{
+    if (code == SERVICE_CONTROL_STOP || code == SERVICE_CONTROL_SHUTDOWN) {
+        ss.dwWin32ExitCode = 0;
+        ss.dwCurrentState = SERVICE_STOPPED;
+    }
+    SetServiceStatus(hStatus, &ss);
 }
 
-static void WINAPI ServiceMain(void) {
-  ss.dwServiceType = SERVICE_WIN32;
-  ss.dwCurrentState = SERVICE_RUNNING;
-  ss.dwControlsAccepted = SERVICE_ACCEPT_STOP | SERVICE_ACCEPT_SHUTDOWN;
+static void WINAPI ServiceMain(void)
+{
+    ss.dwServiceType = SERVICE_WIN32;
+    ss.dwCurrentState = SERVICE_RUNNING;
+    ss.dwControlsAccepted = SERVICE_ACCEPT_STOP | SERVICE_ACCEPT_SHUTDOWN;
 
-  hStatus = RegisterServiceCtrlHandler(server_name, ControlHandler);
-  SetServiceStatus(hStatus, &ss);
+    hStatus = RegisterServiceCtrlHandler(server_name, ControlHandler);
+    SetServiceStatus(hStatus, &ss);
 
-  while (ss.dwCurrentState == SERVICE_RUNNING) {
-    Sleep(1000);
-  }
-  mg_stop(ctx);
+    while (ss.dwCurrentState == SERVICE_RUNNING) {
+        Sleep(1000);
+    }
+    mg_stop(ctx);
 
-  ss.dwCurrentState = SERVICE_STOPPED;
-  ss.dwWin32ExitCode = (DWORD) -1;
-  SetServiceStatus(hStatus, &ss);
+    ss.dwCurrentState = SERVICE_STOPPED;
+    ss.dwWin32ExitCode = (DWORD) -1;
+    SetServiceStatus(hStatus, &ss);
 }
 
 
-static void show_error(void) {
-  char buf[256];
-  FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,
-                NULL, GetLastError(),
-                MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
-                buf, sizeof(buf), NULL);
-  MessageBox(NULL, buf, "Error", MB_OK);
+static void show_error(void)
+{
+    char buf[256];
+    FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,
+                  NULL, GetLastError(),
+                  MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
+                  buf, sizeof(buf), NULL);
+    MessageBox(NULL, buf, "Error", MB_OK);
 }
 
-static void *align(void *ptr, DWORD alig) {
-  ULONG ul = (ULONG) ptr;
-  ul += alig;
-  ul &= ~alig;
-  return ((void *) ul);
+static void *align(void *ptr, DWORD alig)
+{
+    ULONG ul = (ULONG) ptr;
+    ul += alig;
+    ul &= ~alig;
+    return ((void *) ul);
 }
 
-static int is_boolean_option(const char *option_name) {
-  return !strcmp(option_name, "enable_directory_listing") ||
-    !strcmp(option_name, "enable_keep_alive");
+static int is_boolean_option(const char *option_name)
+{
+    return !strcmp(option_name, "enable_directory_listing") ||
+           !strcmp(option_name, "enable_keep_alive");
 }
 
-static int is_filename_option(const char *option_name) {
-  return !strcmp(option_name, "cgi_interpreter") ||
-    !strcmp(option_name, "global_auth_file") ||
-    !strcmp(option_name, "put_delete_auth_file") ||
-    !strcmp(option_name, "access_log_file") ||
-    !strcmp(option_name, "error_log_file") ||
-    !strcmp(option_name, "ssl_certificate");
+static int is_filename_option(const char *option_name)
+{
+    return !strcmp(option_name, "cgi_interpreter") ||
+           !strcmp(option_name, "global_auth_file") ||
+           !strcmp(option_name, "put_delete_auth_file") ||
+           !strcmp(option_name, "access_log_file") ||
+           !strcmp(option_name, "error_log_file") ||
+           !strcmp(option_name, "ssl_certificate");
 }
 
-static int is_directory_option(const char *option_name) {
-  return !strcmp(option_name, "document_root");
+static int is_directory_option(const char *option_name)
+{
+    return !strcmp(option_name, "document_root");
 }
 
-static int is_numeric_options(const char *option_name) {
-  return !strcmp(option_name, "num_threads");
+static int is_numeric_options(const char *option_name)
+{
+    return !strcmp(option_name, "num_threads");
 }
 
-static void save_config(HWND hDlg, FILE *fp) {
-  char value[2000];
-  const char **options, *name, *default_value;
-  int i, id;
+static void save_config(HWND hDlg, FILE *fp)
+{
+    char value[2000];
+    const char **options, *name, *default_value;
+    int i, id;
 
-  fprintf(fp, "%s", config_file_top_comment);
-  options = mg_get_valid_option_names();
-  for (i = 0; options[i * 2] != NULL; i++) {
-    name = options[i * 2];
-    id = ID_CONTROLS + i;
-    if (is_boolean_option(name)) {
-      snprintf(value, sizeof(value), "%s",
-               IsDlgButtonChecked(hDlg, id) ? "yes" : "no");
-    } else {
-      GetDlgItemText(hDlg, id, value, sizeof(value));
-    }
-    default_value = options[i * 2 + 1] == NULL ? "" : options[i * 2 + 1];
-    // If value is the same as default, skip it
-    if (strcmp(value, default_value) != 0) {
-      fprintf(fp, "%s %s\n", name, value);
+    fprintf(fp, "%s", config_file_top_comment);
+    options = mg_get_valid_option_names();
+    for (i = 0; options[i * 2] != NULL; i++) {
+        name = options[i * 2];
+        id = ID_CONTROLS + i;
+        if (is_boolean_option(name)) {
+            snprintf(value, sizeof(value), "%s",
+                     IsDlgButtonChecked(hDlg, id) ? "yes" : "no");
+        } else {
+            GetDlgItemText(hDlg, id, value, sizeof(value));
+        }
+        default_value = options[i * 2 + 1] == NULL ? "" : options[i * 2 + 1];
+        // If value is the same as default, skip it
+        if (strcmp(value, default_value) != 0) {
+            fprintf(fp, "%s %s\n", name, value);
+        }
     }
-  }
 }
 
-static BOOL CALLBACK DlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lP) {
-  FILE *fp;
-  int i;
-  const char *name, *value, **options = mg_get_valid_option_names();
+static BOOL CALLBACK DlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lP)
+{
+    FILE *fp;
+    int i;
+    const char *name, *value, **options = mg_get_valid_option_names();
 
-  switch (msg) {
+    switch (msg) {
     case WM_CLOSE:
-      DestroyWindow(hDlg);
-      break;
+        DestroyWindow(hDlg);
+        break;
 
     case WM_COMMAND:
-      switch (LOWORD(wParam)) {
+        switch (LOWORD(wParam)) {
         case ID_SAVE:
-          EnableWindow(GetDlgItem(hDlg, ID_SAVE), FALSE);
-          if ((fp = fopen(config_file, "w+")) != NULL) {
-            save_config(hDlg, fp);
-            fclose(fp);
-            mg_stop(ctx);
-            start_civetweb(__argc, __argv);
-          }
-          EnableWindow(GetDlgItem(hDlg, ID_SAVE), TRUE);
-          break;
+            EnableWindow(GetDlgItem(hDlg, ID_SAVE), FALSE);
+            if ((fp = fopen(config_file, "w+")) != NULL) {
+                save_config(hDlg, fp);
+                fclose(fp);
+                mg_stop(ctx);
+                start_civetweb(__argc, __argv);
+            }
+            EnableWindow(GetDlgItem(hDlg, ID_SAVE), TRUE);
+            break;
         case ID_RESET_DEFAULTS:
-          for (i = 0; options[i * 2] != NULL; i++) {
-            name = options[i * 2];
-            value = options[i * 2 + 1] == NULL ? "" : options[i * 2 + 1];
-            if (is_boolean_option(name)) {
-              CheckDlgButton(hDlg, ID_CONTROLS + i, !strcmp(value, "yes") ?
-                             BST_CHECKED : BST_UNCHECKED);
-            } else {
-              SetWindowText(GetDlgItem(hDlg, ID_CONTROLS + i), value);
+            for (i = 0; options[i * 2] != NULL; i++) {
+                name = options[i * 2];
+                value = options[i * 2 + 1] == NULL ? "" : options[i * 2 + 1];
+                if (is_boolean_option(name)) {
+                    CheckDlgButton(hDlg, ID_CONTROLS + i, !strcmp(value, "yes") ?
+                                   BST_CHECKED : BST_UNCHECKED);
+                } else {
+                    SetWindowText(GetDlgItem(hDlg, ID_CONTROLS + i), value);
+                }
             }
-          }
-          break;
-      }
+            break;
+        }
 
-      for (i = 0; options[i * 2] != NULL; i++) {
-        name = options[i * 2];
-        if ((is_filename_option(name) || is_directory_option(name)) &&
-            LOWORD(wParam) == ID_CONTROLS + i + ID_FILE_BUTTONS_DELTA) {
-          OPENFILENAME of;
-          BROWSEINFO bi;
-          char path[PATH_MAX] = "";
-
-          memset(&of, 0, sizeof(of));
-          of.lStructSize = sizeof(of);
-          of.hwndOwner = (HWND) hDlg;
-          of.lpstrFile = path;
-          of.nMaxFile = sizeof(path);
-          of.lpstrInitialDir = mg_get_option(ctx, "document_root");
-          of.Flags = OFN_CREATEPROMPT | OFN_NOCHANGEDIR;
-
-          memset(&bi, 0, sizeof(bi));
-          bi.hwndOwner = (HWND) hDlg;
-          bi.lpszTitle = "Choose WWW root directory:";
-          bi.ulFlags = BIF_RETURNONLYFSDIRS;
-
-          if (is_directory_option(name)) {
-            SHGetPathFromIDList(SHBrowseForFolder(&bi), path);
-          } else {
-            GetOpenFileName(&of);
-          }
-
-          if (path[0] != '\0') {
-            SetWindowText(GetDlgItem(hDlg, ID_CONTROLS + i), path);
-          }
+        for (i = 0; options[i * 2] != NULL; i++) {
+            name = options[i * 2];
+            if ((is_filename_option(name) || is_directory_option(name)) &&
+                LOWORD(wParam) == ID_CONTROLS + i + ID_FILE_BUTTONS_DELTA) {
+                OPENFILENAME of;
+                BROWSEINFO bi;
+                char path[PATH_MAX] = "";
+
+                memset(&of, 0, sizeof(of));
+                of.lStructSize = sizeof(of);
+                of.hwndOwner = (HWND) hDlg;
+                of.lpstrFile = path;
+                of.nMaxFile = sizeof(path);
+                of.lpstrInitialDir = mg_get_option(ctx, "document_root");
+                of.Flags = OFN_CREATEPROMPT | OFN_NOCHANGEDIR;
+
+                memset(&bi, 0, sizeof(bi));
+                bi.hwndOwner = (HWND) hDlg;
+                bi.lpszTitle = "Choose WWW root directory:";
+                bi.ulFlags = BIF_RETURNONLYFSDIRS;
+
+                if (is_directory_option(name)) {
+                    SHGetPathFromIDList(SHBrowseForFolder(&bi), path);
+                } else {
+                    GetOpenFileName(&of);
+                }
+
+                if (path[0] != '\0') {
+                    SetWindowText(GetDlgItem(hDlg, ID_CONTROLS + i), path);
+                }
+            }
         }
-      }
 
-      break;
+        break;
 
     case WM_INITDIALOG:
-      SendMessage(hDlg, WM_SETICON,(WPARAM) ICON_SMALL, (LPARAM) hIcon);
-      SendMessage(hDlg, WM_SETICON,(WPARAM) ICON_BIG, (LPARAM) hIcon);
-      SetWindowText(hDlg, "Civetweb settings");
-      SetFocus(GetDlgItem(hDlg, ID_SAVE));
-      for (i = 0; options[i * 2] != NULL; i++) {
-        name = options[i * 2];
-        value = mg_get_option(ctx, name);
-        if (is_boolean_option(name)) {
-          CheckDlgButton(hDlg, ID_CONTROLS + i, !strcmp(value, "yes") ?
-                         BST_CHECKED : BST_UNCHECKED);
-        } else {
-          SetDlgItemText(hDlg, ID_CONTROLS + i, value == NULL ? "" : value);
+        SendMessage(hDlg, WM_SETICON,(WPARAM) ICON_SMALL, (LPARAM) hIcon);
+        SendMessage(hDlg, WM_SETICON,(WPARAM) ICON_BIG, (LPARAM) hIcon);
+        SetWindowText(hDlg, "Civetweb settings");
+        SetFocus(GetDlgItem(hDlg, ID_SAVE));
+        for (i = 0; options[i * 2] != NULL; i++) {
+            name = options[i * 2];
+            value = mg_get_option(ctx, name);
+            if (is_boolean_option(name)) {
+                CheckDlgButton(hDlg, ID_CONTROLS + i, !strcmp(value, "yes") ?
+                               BST_CHECKED : BST_UNCHECKED);
+            } else {
+                SetDlgItemText(hDlg, ID_CONTROLS + i, value == NULL ? "" : value);
+            }
         }
-      }
-      break;
+        break;
     default:
-      break;
-  }
+        break;
+    }
 
-  return FALSE;
+    return FALSE;
 }
 
 static void add_control(unsigned char **mem, DLGTEMPLATE *dia, WORD type,
                         DWORD id, DWORD style, WORD x, WORD y,
-                        WORD cx, WORD cy, const char *caption) {
-  DLGITEMTEMPLATE *tp;
-  LPWORD p;
-
-  dia->cdit++;
-
-  *mem = align(*mem, 3);
-  tp = (DLGITEMTEMPLATE *) *mem;
-
-  tp->id = (WORD)id;
-  tp->style = style;
-  tp->dwExtendedStyle = 0;
-  tp->x = x;
-  tp->y = y;
-  tp->cx = cx;
-  tp->cy = cy;
-
-  p = align(*mem + sizeof(*tp), 1);
-  *p++ = 0xffff;
-  *p++ = type;
-
-  while (*caption != '\0') {
-    *p++ = (WCHAR) *caption++;
-  }
-  *p++ = 0;
-  p = align(p, 1);
+                        WORD cx, WORD cy, const char *caption)
+{
+    DLGITEMTEMPLATE *tp;
+    LPWORD p;
+
+    dia->cdit++;
+
+    *mem = align(*mem, 3);
+    tp = (DLGITEMTEMPLATE *) *mem;
+
+    tp->id = (WORD)id;
+    tp->style = style;
+    tp->dwExtendedStyle = 0;
+    tp->x = x;
+    tp->y = y;
+    tp->cx = cx;
+    tp->cy = cy;
+
+    p = align(*mem + sizeof(*tp), 1);
+    *p++ = 0xffff;
+    *p++ = type;
+
+    while (*caption != '\0') {
+        *p++ = (WCHAR) *caption++;
+    }
+    *p++ = 0;
+    p = align(p, 1);
 
-  *p++ = 0;
-  *mem = (unsigned char *) p;
+    *p++ = 0;
+    *mem = (unsigned char *) p;
 }
 
-static void show_settings_dialog() {
+static void show_settings_dialog()
+{
 #define HEIGHT 15
 #define WIDTH 400
 #define LABEL_WIDTH 80
 
-  unsigned char mem[4096], *p;
-  const char **option_names, *long_option_name;
-  DWORD style;
-  DLGTEMPLATE *dia = (DLGTEMPLATE *) mem;
-  WORD i, cl, x, y, width, nelems = 0;
-  static int guard;
-
-  static struct {
-    DLGTEMPLATE template; // 18 bytes
-    WORD menu, class;
-    wchar_t caption[1];
-    WORD fontsiz;
-    wchar_t fontface[7];
-  } dialog_header = {{WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE |
-    DS_SETFONT | WS_DLGFRAME, WS_EX_TOOLWINDOW, 0, 200, 200, WIDTH, 0},
-    0, 0, L"", 8, L"Tahoma"};
-
-  if (guard == 0) {
-    guard++;
-  } else {
-    return;
-  }
-
-  (void) memset(mem, 0, sizeof(mem));
-  (void) memcpy(mem, &dialog_header, sizeof(dialog_header));
-  p = mem + sizeof(dialog_header);
-
-  option_names = mg_get_valid_option_names();
-  for (i = 0; option_names[i * 2] != NULL; i++) {
-    long_option_name = option_names[i * 2];
-    style = WS_CHILD | WS_VISIBLE | WS_TABSTOP;
-    x = 10 + (WIDTH / 2) * (nelems % 2);
-    y = (nelems/2 + 1) * HEIGHT + 5;
-    width = WIDTH / 2 - 20 - LABEL_WIDTH;
-    if (is_numeric_options(long_option_name)) {
-      style |= ES_NUMBER;
-      cl = 0x81;
-      style |= WS_BORDER | ES_AUTOHSCROLL;
-    } else if (is_boolean_option(long_option_name)) {
-      cl = 0x80;
-      style |= BS_AUTOCHECKBOX;
-    } else if (is_filename_option(long_option_name) ||
-               is_directory_option(long_option_name)) {
-      style |= WS_BORDER | ES_AUTOHSCROLL;
-      width -= 20;
-      cl = 0x81;
-      add_control(&p, dia, 0x80,
-                  ID_CONTROLS + i + ID_FILE_BUTTONS_DELTA,
-                  WS_VISIBLE | WS_CHILD | BS_PUSHBUTTON,
-                  (WORD) (x + width + LABEL_WIDTH + 5),
-                  y, 15, 12, "...");
+    unsigned char mem[4096], *p;
+    const char **option_names, *long_option_name;
+    DWORD style;
+    DLGTEMPLATE *dia = (DLGTEMPLATE *) mem;
+    WORD i, cl, x, y, width, nelems = 0;
+    static int guard;
+
+    static struct {
+        DLGTEMPLATE template; // 18 bytes
+        WORD menu, class;
+        wchar_t caption[1];
+        WORD fontsiz;
+        wchar_t fontface[7];
+    } dialog_header = {{
+            WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE |
+            DS_SETFONT | WS_DLGFRAME, WS_EX_TOOLWINDOW, 0, 200, 200, WIDTH, 0
+        },
+        0, 0, L"", 8, L"Tahoma"
+    };
+
+    if (guard == 0) {
+        guard++;
     } else {
-      cl = 0x81;
-      style |= WS_BORDER | ES_AUTOHSCROLL;
+        return;
     }
-    add_control(&p, dia, 0x82, ID_STATIC, WS_VISIBLE | WS_CHILD,
-                x, y, LABEL_WIDTH, HEIGHT, long_option_name);
-    add_control(&p, dia, cl, ID_CONTROLS + i, style,
-                (WORD) (x + LABEL_WIDTH), y, width, 12, "");
-    nelems++;
-  }
-
-  y = (WORD) (((nelems + 1) / 2 + 1) * HEIGHT + 5);
-  add_control(&p, dia, 0x80, ID_GROUP, WS_CHILD | WS_VISIBLE |
-              BS_GROUPBOX, 5, 5, WIDTH - 10, y, " Settings ");
-  y += 10;
-  add_control(&p, dia, 0x80, ID_SAVE,
-              WS_CHILD | WS_VISIBLE | BS_PUSHBUTTON | WS_TABSTOP,
-              WIDTH - 70, y, 65, 12, "Save Settings");
-  add_control(&p, dia, 0x80, ID_RESET_DEFAULTS,
-              WS_CHILD | WS_VISIBLE | BS_PUSHBUTTON | WS_TABSTOP,
-              WIDTH - 140, y, 65, 12, "Reset to defaults");
-  add_control(&p, dia, 0x82, ID_STATIC,
-              WS_CHILD | WS_VISIBLE | WS_DISABLED,
-              5, y, 180, 12, server_name);
-
-  dia->cy = ((nelems + 1) / 2 + 1) * HEIGHT + 30;
-  DialogBoxIndirectParam(NULL, dia, NULL, DlgProc, (LPARAM) NULL);
-  guard--;
-}
-
-static int manage_service(int action) {
-  static const char *service_name = "Civetweb";
-  SC_HANDLE hSCM = NULL, hService = NULL;
-  SERVICE_DESCRIPTION descr = {server_name};
-  char path[PATH_MAX + 20];  // Path to executable plus magic argument
-  int success = 1;
-
-  if ((hSCM = OpenSCManager(NULL, NULL, action == ID_INSTALL_SERVICE ?
-                            GENERIC_WRITE : GENERIC_READ)) == NULL) {
-    success = 0;
-    show_error();
-  } else if (action == ID_INSTALL_SERVICE) {
-    GetModuleFileName(NULL, path, sizeof(path));
-    strncat(path, " ", sizeof(path));
-    strncat(path, service_magic_argument, sizeof(path));
-    hService = CreateService(hSCM, service_name, service_name,
-                             SERVICE_ALL_ACCESS, SERVICE_WIN32_OWN_PROCESS,
-                             SERVICE_AUTO_START, SERVICE_ERROR_NORMAL,
-                             path, NULL, NULL, NULL, NULL, NULL);
-    if (hService) {
-      ChangeServiceConfig2(hService, SERVICE_CONFIG_DESCRIPTION, &descr);
-    } else {
-      show_error();
+
+    (void) memset(mem, 0, sizeof(mem));
+    (void) memcpy(mem, &dialog_header, sizeof(dialog_header));
+    p = mem + sizeof(dialog_header);
+
+    option_names = mg_get_valid_option_names();
+    for (i = 0; option_names[i * 2] != NULL; i++) {
+        long_option_name = option_names[i * 2];
+        style = WS_CHILD | WS_VISIBLE | WS_TABSTOP;
+        x = 10 + (WIDTH / 2) * (nelems % 2);
+        y = (nelems/2 + 1) * HEIGHT + 5;
+        width = WIDTH / 2 - 20 - LABEL_WIDTH;
+        if (is_numeric_options(long_option_name)) {
+            style |= ES_NUMBER;
+            cl = 0x81;
+            style |= WS_BORDER | ES_AUTOHSCROLL;
+        } else if (is_boolean_option(long_option_name)) {
+            cl = 0x80;
+            style |= BS_AUTOCHECKBOX;
+        } else if (is_filename_option(long_option_name) ||
+                   is_directory_option(long_option_name)) {
+            style |= WS_BORDER | ES_AUTOHSCROLL;
+            width -= 20;
+            cl = 0x81;
+            add_control(&p, dia, 0x80,
+                        ID_CONTROLS + i + ID_FILE_BUTTONS_DELTA,
+                        WS_VISIBLE | WS_CHILD | BS_PUSHBUTTON,
+                        (WORD) (x + width + LABEL_WIDTH + 5),
+                        y, 15, 12, "...");
+        } else {
+            cl = 0x81;
+            style |= WS_BORDER | ES_AUTOHSCROLL;
+        }
+        add_control(&p, dia, 0x82, ID_STATIC, WS_VISIBLE | WS_CHILD,
+                    x, y, LABEL_WIDTH, HEIGHT, long_option_name);
+        add_control(&p, dia, cl, ID_CONTROLS + i, style,
+                    (WORD) (x + LABEL_WIDTH), y, width, 12, "");
+        nelems++;
     }
-  } else if (action == ID_REMOVE_SERVICE) {
-    if ((hService = OpenService(hSCM, service_name, DELETE)) == NULL ||
-        !DeleteService(hService)) {
-      show_error();
+
+    y = (WORD) (((nelems + 1) / 2 + 1) * HEIGHT + 5);
+    add_control(&p, dia, 0x80, ID_GROUP, WS_CHILD | WS_VISIBLE |
+                BS_GROUPBOX, 5, 5, WIDTH - 10, y, " Settings ");
+    y += 10;
+    add_control(&p, dia, 0x80, ID_SAVE,
+                WS_CHILD | WS_VISIBLE | BS_PUSHBUTTON | WS_TABSTOP,
+                WIDTH - 70, y, 65, 12, "Save Settings");
+    add_control(&p, dia, 0x80, ID_RESET_DEFAULTS,
+                WS_CHILD | WS_VISIBLE | BS_PUSHBUTTON | WS_TABSTOP,
+                WIDTH - 140, y, 65, 12, "Reset to defaults");
+    add_control(&p, dia, 0x82, ID_STATIC,
+                WS_CHILD | WS_VISIBLE | WS_DISABLED,
+                5, y, 180, 12, server_name);
+
+    dia->cy = ((nelems + 1) / 2 + 1) * HEIGHT + 30;
+    DialogBoxIndirectParam(NULL, dia, NULL, DlgProc, (LPARAM) NULL);
+    guard--;
+}
+
+static int manage_service(int action)
+{
+    static const char *service_name = "Civetweb";
+    SC_HANDLE hSCM = NULL, hService = NULL;
+    SERVICE_DESCRIPTION descr = {server_name};
+    char path[PATH_MAX + 20];  // Path to executable plus magic argument
+    int success = 1;
+
+    if ((hSCM = OpenSCManager(NULL, NULL, action == ID_INSTALL_SERVICE ?
+                              GENERIC_WRITE : GENERIC_READ)) == NULL) {
+        success = 0;
+        show_error();
+    } else if (action == ID_INSTALL_SERVICE) {
+        GetModuleFileName(NULL, path, sizeof(path));
+        strncat(path, " ", sizeof(path));
+        strncat(path, service_magic_argument, sizeof(path));
+        hService = CreateService(hSCM, service_name, service_name,
+                                 SERVICE_ALL_ACCESS, SERVICE_WIN32_OWN_PROCESS,
+                                 SERVICE_AUTO_START, SERVICE_ERROR_NORMAL,
+                                 path, NULL, NULL, NULL, NULL, NULL);
+        if (hService) {
+            ChangeServiceConfig2(hService, SERVICE_CONFIG_DESCRIPTION, &descr);
+        } else {
+            show_error();
+        }
+    } else if (action == ID_REMOVE_SERVICE) {
+        if ((hService = OpenService(hSCM, service_name, DELETE)) == NULL ||
+            !DeleteService(hService)) {
+            show_error();
+        }
+    } else if ((hService = OpenService(hSCM, service_name,
+                                       SERVICE_QUERY_STATUS)) == NULL) {
+        success = 0;
     }
-  } else if ((hService = OpenService(hSCM, service_name,
-                                     SERVICE_QUERY_STATUS)) == NULL) {
-    success = 0;
-  }
 
-  CloseServiceHandle(hService);
-  CloseServiceHandle(hSCM);
+    CloseServiceHandle(hService);
+    CloseServiceHandle(hSCM);
 
-  return success;
+    return success;
 }
 
 static LRESULT CALLBACK WindowProc(HWND hWnd, UINT msg, WPARAM wParam,
-                                   LPARAM lParam) {
-  static SERVICE_TABLE_ENTRY service_table[] = {
-    {server_name, (LPSERVICE_MAIN_FUNCTION) ServiceMain},
-    {NULL, NULL}
-  };
-  int service_installed;
-  char buf[200], *service_argv[] = {__argv[0], NULL};
-  POINT pt;
-  HMENU hMenu;
-  static UINT s_uTaskbarRestart; // for taskbar creation
-
-  switch (msg) {
+                                   LPARAM lParam)
+{
+    static SERVICE_TABLE_ENTRY service_table[] = {
+        {server_name, (LPSERVICE_MAIN_FUNCTION) ServiceMain},
+        {NULL, NULL}
+    };
+    int service_installed;
+    char buf[200], *service_argv[] = {__argv[0], NULL};
+    POINT pt;
+    HMENU hMenu;
+    static UINT s_uTaskbarRestart; // for taskbar creation
+
+    switch (msg) {
     case WM_CREATE:
-      if (__argv[1] != NULL &&
-          !strcmp(__argv[1], service_magic_argument)) {
-        start_civetweb(1, service_argv);
-        StartServiceCtrlDispatcher(service_table);
-        exit(EXIT_SUCCESS);
-      } else {
-        start_civetweb(__argc, __argv);
-        s_uTaskbarRestart = RegisterWindowMessage(TEXT("TaskbarCreated"));
-      }
-      break;
+        if (__argv[1] != NULL &&
+            !strcmp(__argv[1], service_magic_argument)) {
+            start_civetweb(1, service_argv);
+            StartServiceCtrlDispatcher(service_table);
+            exit(EXIT_SUCCESS);
+        } else {
+            start_civetweb(__argc, __argv);
+            s_uTaskbarRestart = RegisterWindowMessage(TEXT("TaskbarCreated"));
+        }
+        break;
     case WM_COMMAND:
-      switch (LOWORD(wParam)) {
+        switch (LOWORD(wParam)) {
         case ID_QUIT:
-          mg_stop(ctx);
-          Shell_NotifyIcon(NIM_DELETE, &TrayIcon);
-          PostQuitMessage(0);
-          return 0;
+            mg_stop(ctx);
+            Shell_NotifyIcon(NIM_DELETE, &TrayIcon);
+            PostQuitMessage(0);
+            return 0;
         case ID_SETTINGS:
-          show_settings_dialog();
-          break;
+            show_settings_dialog();
+            break;
         case ID_INSTALL_SERVICE:
         case ID_REMOVE_SERVICE:
-          manage_service(LOWORD(wParam));
-          break;
+            manage_service(LOWORD(wParam));
+            break;
         case ID_CONNECT:
-          printf("[%s]\n", get_url_to_first_open_port(ctx));
-          ShellExecute(NULL, "open", get_url_to_first_open_port(ctx),
-                       NULL, NULL, SW_SHOW);
-          break;
-      }
-      break;
+            printf("[%s]\n", get_url_to_first_open_port(ctx));
+            ShellExecute(NULL, "open", get_url_to_first_open_port(ctx),
+                         NULL, NULL, SW_SHOW);
+            break;
+        }
+        break;
     case WM_USER:
-      switch (lParam) {
+        switch (lParam) {
         case WM_RBUTTONUP:
         case WM_LBUTTONUP:
         case WM_LBUTTONDBLCLK:
-          hMenu = CreatePopupMenu();
-          AppendMenu(hMenu, MF_STRING | MF_GRAYED, ID_SEPARATOR, server_name);
-          AppendMenu(hMenu, MF_SEPARATOR, ID_SEPARATOR, "");
-          service_installed = manage_service(0);
-          snprintf(buf, sizeof(buf), "NT service: %s installed",
-                   service_installed ? "" : "not");
-          AppendMenu(hMenu, MF_STRING | MF_GRAYED, ID_SEPARATOR, buf);
-          AppendMenu(hMenu, MF_STRING | (service_installed ? MF_GRAYED : 0),
-                     ID_INSTALL_SERVICE, "Install service");
-          AppendMenu(hMenu, MF_STRING | (!service_installed ? MF_GRAYED : 0),
-                     ID_REMOVE_SERVICE, "Deinstall service");
-          AppendMenu(hMenu, MF_SEPARATOR, ID_SEPARATOR, "");
-          AppendMenu(hMenu, MF_STRING, ID_CONNECT, "Start browser");
-          AppendMenu(hMenu, MF_STRING, ID_SETTINGS, "Edit Settings");
-          AppendMenu(hMenu, MF_SEPARATOR, ID_SEPARATOR, "");
-          AppendMenu(hMenu, MF_STRING, ID_QUIT, "Exit");
-          GetCursorPos(&pt);
-          SetForegroundWindow(hWnd);
-          TrackPopupMenu(hMenu, 0, pt.x, pt.y, 0, hWnd, NULL);
-          PostMessage(hWnd, WM_NULL, 0, 0);
-          DestroyMenu(hMenu);
-          break;
-      }
-      break;
+            hMenu = CreatePopupMenu();
+            AppendMenu(hMenu, MF_STRING | MF_GRAYED, ID_SEPARATOR, server_name);
+            AppendMenu(hMenu, MF_SEPARATOR, ID_SEPARATOR, "");
+            service_installed = manage_service(0);
+            snprintf(buf, sizeof(buf), "NT service: %s installed",
+                     service_installed ? "" : "not");
+            AppendMenu(hMenu, MF_STRING | MF_GRAYED, ID_SEPARATOR, buf);
+            AppendMenu(hMenu, MF_STRING | (service_installed ? MF_GRAYED : 0),
+                       ID_INSTALL_SERVICE, "Install service");
+            AppendMenu(hMenu, MF_STRING | (!service_installed ? MF_GRAYED : 0),
+                       ID_REMOVE_SERVICE, "Deinstall service");
+            AppendMenu(hMenu, MF_SEPARATOR, ID_SEPARATOR, "");
+            AppendMenu(hMenu, MF_STRING, ID_CONNECT, "Start browser");
+            AppendMenu(hMenu, MF_STRING, ID_SETTINGS, "Edit Settings");
+            AppendMenu(hMenu, MF_SEPARATOR, ID_SEPARATOR, "");
+            AppendMenu(hMenu, MF_STRING, ID_QUIT, "Exit");
+            GetCursorPos(&pt);
+            SetForegroundWindow(hWnd);
+            TrackPopupMenu(hMenu, 0, pt.x, pt.y, 0, hWnd, NULL);
+            PostMessage(hWnd, WM_NULL, 0, 0);
+            DestroyMenu(hMenu);
+            break;
+        }
+        break;
     case WM_CLOSE:
-      mg_stop(ctx);
-      Shell_NotifyIcon(NIM_DELETE, &TrayIcon);
-      PostQuitMessage(0);
-      return 0;  // We've just sent our own quit message, with proper hwnd.
+        mg_stop(ctx);
+        Shell_NotifyIcon(NIM_DELETE, &TrayIcon);
+        PostQuitMessage(0);
+        return 0;  // We've just sent our own quit message, with proper hwnd.
     default:
-      if (msg==s_uTaskbarRestart)
-        Shell_NotifyIcon(NIM_ADD, &TrayIcon);
-  }
-
-  return DefWindowProc(hWnd, msg, wParam, lParam);
-}
-
-int WINAPI WinMain(HINSTANCE hInst, HINSTANCE hPrev, LPSTR cmdline, int show) {
-  WNDCLASS cls;
-  HWND hWnd;
-  MSG msg;
-
-  init_server_name();
-  memset(&cls, 0, sizeof(cls));
-  cls.lpfnWndProc = (WNDPROC) WindowProc;
-  cls.hIcon = LoadIcon(NULL, IDI_APPLICATION);
-  cls.lpszClassName = server_name;
-
-  RegisterClass(&cls);
-  hWnd = CreateWindow(cls.lpszClassName, server_name, WS_OVERLAPPEDWINDOW,
-                      0, 0, 0, 0, NULL, NULL, NULL, NULL);
-  ShowWindow(hWnd, SW_HIDE);
-
-  TrayIcon.cbSize = sizeof(TrayIcon);
-  TrayIcon.uID = ID_ICON;
-  TrayIcon.uFlags = NIF_ICON | NIF_MESSAGE | NIF_TIP;
-  TrayIcon.hIcon = hIcon = LoadImage(GetModuleHandle(NULL),
-                                     MAKEINTRESOURCE(ID_ICON),
-                                     IMAGE_ICON, 16, 16, 0);
-  TrayIcon.hWnd = hWnd;
-  snprintf(TrayIcon.szTip, sizeof(TrayIcon.szTip), "%s", server_name);
-  TrayIcon.uCallbackMessage = WM_USER;
-  Shell_NotifyIcon(NIM_ADD, &TrayIcon);
-
-  while (GetMessage(&msg, hWnd, 0, 0) > 0) {
-    TranslateMessage(&msg);
-    DispatchMessage(&msg);
-  }
-
-  // Return the WM_QUIT value.
-  return msg.wParam;
+        if (msg==s_uTaskbarRestart)
+            Shell_NotifyIcon(NIM_ADD, &TrayIcon);
+    }
+
+    return DefWindowProc(hWnd, msg, wParam, lParam);
+}
+
+int WINAPI WinMain(HINSTANCE hInst, HINSTANCE hPrev, LPSTR cmdline, int show)
+{
+    WNDCLASS cls;
+    HWND hWnd;
+    MSG msg;
+
+    init_server_name();
+    memset(&cls, 0, sizeof(cls));
+    cls.lpfnWndProc = (WNDPROC) WindowProc;
+    cls.hIcon = LoadIcon(NULL, IDI_APPLICATION);
+    cls.lpszClassName = server_name;
+
+    RegisterClass(&cls);
+    hWnd = CreateWindow(cls.lpszClassName, server_name, WS_OVERLAPPEDWINDOW,
+                        0, 0, 0, 0, NULL, NULL, NULL, NULL);
+    ShowWindow(hWnd, SW_HIDE);
+
+    TrayIcon.cbSize = sizeof(TrayIcon);
+    TrayIcon.uID = ID_ICON;
+    TrayIcon.uFlags = NIF_ICON | NIF_MESSAGE | NIF_TIP;
+    TrayIcon.hIcon = hIcon = LoadImage(GetModuleHandle(NULL),
+                                       MAKEINTRESOURCE(ID_ICON),
+                                       IMAGE_ICON, 16, 16, 0);
+    TrayIcon.hWnd = hWnd;
+    snprintf(TrayIcon.szTip, sizeof(TrayIcon.szTip), "%s", server_name);
+    TrayIcon.uCallbackMessage = WM_USER;
+    Shell_NotifyIcon(NIM_ADD, &TrayIcon);
+
+    while (GetMessage(&msg, hWnd, 0, 0) > 0) {
+        TranslateMessage(&msg);
+        DispatchMessage(&msg);
+    }
+
+    // Return the WM_QUIT value.
+    return msg.wParam;
 }
 #elif defined(USE_COCOA)
 #import <Cocoa/Cocoa.h>
 
-@interface Civetweb : NSObject<NSApplicationDelegate>
+@interface Civetweb :
+NSObject<NSApplicationDelegate>
 - (void) openBrowser;
 - (void) shutDown;
 @end
 
 @implementation Civetweb
 - (void) openBrowser {
-  [[NSWorkspace sharedWorkspace]
-    openURL:[NSURL URLWithString:
-      [NSString stringWithUTF8String:get_url_to_first_open_port(ctx)]]];
+    [[NSWorkspace sharedWorkspace]
+openURL:[NSURL URLWithString:
+[NSString stringWithUTF8String:get_url_to_first_open_port(ctx)]]];
 }
 - (void) editConfig {
-  create_config_file(config_file);
-  [[NSWorkspace sharedWorkspace]
-    openFile:[NSString stringWithUTF8String:config_file]
-    withApplication:@"TextEdit"];
+    create_config_file(config_file);
+    [[NSWorkspace sharedWorkspace]
+openFile:[NSString stringWithUTF8String:config_file]
+withApplication:@"TextEdit"];
 }
-- (void)shutDown{
-  [NSApp terminate:nil];
+- (void)shutDown {
+[NSApp terminate:nil];
 }
 @end
 
-int main(int argc, char *argv[]) {
-  init_server_name();
-  start_civetweb(argc, argv);
+int main(int argc, char *argv[])
+{
+    init_server_name();
+    start_civetweb(argc, argv);
 
-  [NSAutoreleasePool new];
-  [NSApplication sharedApplication];
+    [NSAutoreleasePool new];
+    [NSApplication sharedApplication];
 
-  // Add delegate to process menu item actions
-  Civetweb *myDelegate = [[Civetweb alloc] autorelease];
-  [NSApp setDelegate: myDelegate];
+    // Add delegate to process menu item actions
+    Civetweb *myDelegate = [[Civetweb alloc] autorelease];
+[NSApp setDelegate: myDelegate];
 
-  // Run this app as agent
-  ProcessSerialNumber psn = { 0, kCurrentProcess };
-  TransformProcessType(&psn, kProcessTransformToBackgroundApplication);
-  SetFrontProcess(&psn);
+    // Run this app as agent
+    ProcessSerialNumber psn = { 0, kCurrentProcess };
+    TransformProcessType(&psn, kProcessTransformToBackgroundApplication);
+    SetFrontProcess(&psn);
 
-  // Add status bar menu
-  id menu = [[NSMenu new] autorelease];
+    // Add status bar menu
+    id menu = [[NSMenu new] autorelease];
 
-  // Add version menu item
-  [menu addItem:[[[NSMenuItem alloc]
-    //initWithTitle:[NSString stringWithFormat:@"%s", server_name]
-    initWithTitle:[NSString stringWithUTF8String:server_name]
-    action:@selector(noexist) keyEquivalent:@""] autorelease]];
+    // Add version menu item
+[menu addItem:[[[NSMenuItem alloc]
+                    //initWithTitle:[NSString stringWithFormat:@"%s", server_name]
+                initWithTitle:[NSString stringWithUTF8String:server_name]
+                action:@selector(noexist) keyEquivalent:@""] autorelease]];
 
-  // Add configuration menu item
-  [menu addItem:[[[NSMenuItem alloc]
-    initWithTitle:@"Edit configuration"
-    action:@selector(editConfig) keyEquivalent:@""] autorelease]];
+    // Add configuration menu item
+[menu addItem:[[[NSMenuItem alloc]
+                initWithTitle:@"Edit configuration"
+                action:@selector(editConfig) keyEquivalent:@""] autorelease]];
 
-  // Add connect menu item
-  [menu addItem:[[[NSMenuItem alloc]
-    initWithTitle:@"Open web root in a browser"
-    action:@selector(openBrowser) keyEquivalent:@""] autorelease]];
+    // Add connect menu item
+[menu addItem:[[[NSMenuItem alloc]
+                initWithTitle:@"Open web root in a browser"
+                action:@selector(openBrowser) keyEquivalent:@""] autorelease]];
 
-  // Separator
-  [menu addItem:[NSMenuItem separatorItem]];
+    // Separator
+[menu addItem:[NSMenuItem separatorItem]];
 
-  // Add quit menu item
-  [menu addItem:[[[NSMenuItem alloc]
-    initWithTitle:@"Quit"
-    action:@selector(shutDown) keyEquivalent:@"q"] autorelease]];
+    // Add quit menu item
+[menu addItem:[[[NSMenuItem alloc]
+                initWithTitle:@"Quit"
+                action:@selector(shutDown) keyEquivalent:@"q"] autorelease]];
 
-  // Attach menu to the status bar
-  id item = [[[NSStatusBar systemStatusBar]
-    statusItemWithLength:NSVariableStatusItemLength] retain];
-  [item setHighlightMode:YES];
-  [item setImage:[NSImage imageNamed:@"civetweb_22x22.png"]];
-  [item setMenu:menu];
+    // Attach menu to the status bar
+    id item = [[[NSStatusBar systemStatusBar]
+            statusItemWithLength:NSVariableStatusItemLength] retain];
+[item setHighlightMode:YES];
+[item setImage:[NSImage imageNamed:@"civetweb_22x22.png"]];
+[item setMenu:menu];
 
-  // Run the app
-  [NSApp activateIgnoringOtherApps:YES];
-  [NSApp run];
+    // Run the app
+[NSApp activateIgnoringOtherApps:YES];
+    [NSApp run];
 
-  mg_stop(ctx);
+    mg_stop(ctx);
 
-  return EXIT_SUCCESS;
+    return EXIT_SUCCESS;
 }
 #else
-int main(int argc, char *argv[]) {
-  init_server_name();
-  start_civetweb(argc, argv);
-  printf("%s started on port(s) %s with web root [%s]\n",
-         server_name, mg_get_option(ctx, "listening_ports"),
-         mg_get_option(ctx, "document_root"));
-  while (exit_flag == 0) {
-    sleep(1);
-  }
-  printf("Exiting on signal %d, waiting for all threads to finish...",
-         exit_flag);
-  fflush(stdout);
-  mg_stop(ctx);
-  printf("%s", " done.\n");
-
-  return EXIT_SUCCESS;
+int main(int argc, char *argv[])
+{
+    init_server_name();
+    start_civetweb(argc, argv);
+    printf("%s started on port(s) %s with web root [%s]\n",
+           server_name, mg_get_option(ctx, "listening_ports"),
+           mg_get_option(ctx, "document_root"));
+    while (exit_flag == 0) {
+        sleep(1);
+    }
+    printf("Exiting on signal %d, waiting for all threads to finish...",
+           exit_flag);
+    fflush(stdout);
+    mg_stop(ctx);
+    printf("%s", " done.\n");
+
+    return EXIT_SUCCESS;
 }
 #endif /* _WIN32 */

src/md5.inl

@@ -1,4 +1,4 @@
-/* 
+/*
  * This an amalgamation of md5.c and md5.h into a single file
  * with all static declaration to reduce linker conflicts
  * in Civetweb.
@@ -58,7 +58,7 @@ typedef struct md5_state_s {
 } md5_state_t;
 
 #ifdef __cplusplus
-extern "C" 
+extern "C"
 {
 #endif
 
@@ -212,8 +212,8 @@ static void
 md5_process(md5_state_t *pms, const md5_byte_t *data /*[64]*/)
 {
     md5_word_t
-	a = pms->abcd[0], b = pms->abcd[1],
-	c = pms->abcd[2], d = pms->abcd[3];
+    a = pms->abcd[0], b = pms->abcd[1],
+    c = pms->abcd[2], d = pms->abcd[3];
     md5_word_t t;
 #if BYTE_ORDER > 0
     /* Define storage only for big-endian CPUs. */
@@ -226,51 +226,51 @@ md5_process(md5_state_t *pms, const md5_byte_t *data /*[64]*/)
 
     {
 #if BYTE_ORDER == 0
-	/*
-	 * Determine dynamically whether this is a big-endian or
-	 * little-endian machine, since we can use a more efficient
-	 * algorithm on the latter.
-	 */
-	static const int w = 1;
-
-	if (*((const md5_byte_t *)&w)) /* dynamic little-endian */
+        /*
+         * Determine dynamically whether this is a big-endian or
+         * little-endian machine, since we can use a more efficient
+         * algorithm on the latter.
+         */
+        static const int w = 1;
+
+        if (*((const md5_byte_t *)&w)) /* dynamic little-endian */
 #endif
 #if BYTE_ORDER <= 0		/* little-endian */
-	{
-	    /*
-	     * On little-endian machines, we can process properly aligned
-	     * data without copying it.
-	     */
-	    if (!((data - (const md5_byte_t *)0) & 3)) {
-		/* data are properly aligned */
-		X = (const md5_word_t *)data;
-	    } else {
-		/* not aligned */
-		memcpy(xbuf, data, 64);
-		X = xbuf;
-	    }
-	}
+        {
+            /*
+             * On little-endian machines, we can process properly aligned
+             * data without copying it.
+             */
+            if (!((data - (const md5_byte_t *)0) & 3)) {
+                /* data are properly aligned */
+                X = (const md5_word_t *)data;
+            } else {
+                /* not aligned */
+                memcpy(xbuf, data, 64);
+                X = xbuf;
+            }
+        }
 #endif
 #if BYTE_ORDER == 0
-	else			/* dynamic big-endian */
+        else			/* dynamic big-endian */
 #endif
 #if BYTE_ORDER >= 0		/* big-endian */
-	{
-	    /*
-	     * On big-endian machines, we must arrange the bytes in the
-	     * right order.
-	     */
-	    const md5_byte_t *xp = data;
-	    int i;
+        {
+            /*
+             * On big-endian machines, we must arrange the bytes in the
+             * right order.
+             */
+            const md5_byte_t *xp = data;
+            int i;
 
 #  if BYTE_ORDER == 0
-	    X = xbuf;		/* (dynamic only) */
+            X = xbuf;		/* (dynamic only) */
 #  else
 #    define xbuf X		/* (static only) */
 #  endif
-	    for (i = 0; i < 16; ++i, xp += 4)
-		xbuf[i] = xp[0] + (xp[1] << 8) + (xp[2] << 16) + (xp[3] << 24);
-	}
+            for (i = 0; i < 16; ++i, xp += 4)
+                xbuf[i] = xp[0] + (xp[1] << 8) + (xp[2] << 16) + (xp[3] << 24);
+        }
 #endif
     }
 
@@ -302,14 +302,14 @@ md5_process(md5_state_t *pms, const md5_byte_t *data /*[64]*/)
     SET(b, c, d, a, 15, 22, T16);
 #undef SET
 
-     /* Round 2. */
-     /* Let [abcd k s i] denote the operation
-          a = b + ((a + G(b,c,d) + X[k] + T[i]) <<< s). */
+    /* Round 2. */
+    /* Let [abcd k s i] denote the operation
+         a = b + ((a + G(b,c,d) + X[k] + T[i]) <<< s). */
 #define G(x, y, z) (((x) & (z)) | ((y) & ~(z)))
 #define SET(a, b, c, d, k, s, Ti)\
   t = a + G(b,c,d) + X[k] + Ti;\
   a = ROTATE_LEFT(t, s) + b
-     /* Do the following 16 operations. */
+    /* Do the following 16 operations. */
     SET(a, b, c, d,  1,  5, T17);
     SET(d, a, b, c,  6,  9, T18);
     SET(c, d, a, b, 11, 14, T19);
@@ -328,14 +328,14 @@ md5_process(md5_state_t *pms, const md5_byte_t *data /*[64]*/)
     SET(b, c, d, a, 12, 20, T32);
 #undef SET
 
-     /* Round 3. */
-     /* Let [abcd k s t] denote the operation
-          a = b + ((a + H(b,c,d) + X[k] + T[i]) <<< s). */
+    /* Round 3. */
+    /* Let [abcd k s t] denote the operation
+         a = b + ((a + H(b,c,d) + X[k] + T[i]) <<< s). */
 #define H(x, y, z) ((x) ^ (y) ^ (z))
 #define SET(a, b, c, d, k, s, Ti)\
   t = a + H(b,c,d) + X[k] + Ti;\
   a = ROTATE_LEFT(t, s) + b
-     /* Do the following 16 operations. */
+    /* Do the following 16 operations. */
     SET(a, b, c, d,  5,  4, T33);
     SET(d, a, b, c,  8, 11, T34);
     SET(c, d, a, b, 11, 16, T35);
@@ -354,14 +354,14 @@ md5_process(md5_state_t *pms, const md5_byte_t *data /*[64]*/)
     SET(b, c, d, a,  2, 23, T48);
 #undef SET
 
-     /* Round 4. */
-     /* Let [abcd k s t] denote the operation
-          a = b + ((a + I(b,c,d) + X[k] + T[i]) <<< s). */
+    /* Round 4. */
+    /* Let [abcd k s t] denote the operation
+         a = b + ((a + I(b,c,d) + X[k] + T[i]) <<< s). */
 #define I(x, y, z) ((y) ^ ((x) | ~(z)))
 #define SET(a, b, c, d, k, s, Ti)\
   t = a + I(b,c,d) + X[k] + Ti;\
   a = ROTATE_LEFT(t, s) + b
-     /* Do the following 16 operations. */
+    /* Do the following 16 operations. */
     SET(a, b, c, d,  0,  6, T49);
     SET(d, a, b, c,  7, 10, T50);
     SET(c, d, a, b, 14, 15, T51);
@@ -380,9 +380,9 @@ md5_process(md5_state_t *pms, const md5_byte_t *data /*[64]*/)
     SET(b, c, d, a,  9, 21, T64);
 #undef SET
 
-     /* Then perform the following additions. (That is increment each
-        of the four registers by the value it had before this block
-        was started.) */
+    /* Then perform the following additions. (That is increment each
+       of the four registers by the value it had before this block
+       was started.) */
     pms->abcd[0] += a;
     pms->abcd[1] += b;
     pms->abcd[2] += c;
@@ -408,54 +408,54 @@ md5_append(md5_state_t *pms, const md5_byte_t *data, int nbytes)
     md5_word_t nbits = (md5_word_t)(nbytes << 3);
 
     if (nbytes <= 0)
-	return;
+        return;
 
     /* Update the message length. */
     pms->count[1] += nbytes >> 29;
     pms->count[0] += nbits;
     if (pms->count[0] < nbits)
-	pms->count[1]++;
+        pms->count[1]++;
 
     /* Process an initial partial block. */
     if (offset) {
-	int copy = (offset + nbytes > 64 ? 64 - offset : nbytes);
-
-	memcpy(pms->buf + offset, p, copy);
-	if (offset + copy < 64)
-	    return;
-	p += copy;
-	left -= copy;
-	md5_process(pms, pms->buf);
+        int copy = (offset + nbytes > 64 ? 64 - offset : nbytes);
+
+        memcpy(pms->buf + offset, p, copy);
+        if (offset + copy < 64)
+            return;
+        p += copy;
+        left -= copy;
+        md5_process(pms, pms->buf);
     }
 
     /* Process full blocks. */
     for (; left >= 64; p += 64, left -= 64)
-	md5_process(pms, p);
+        md5_process(pms, p);
 
     /* Process a final partial block. */
     if (left)
-	memcpy(pms->buf, p, left);
+        memcpy(pms->buf, p, left);
 }
 
 MD5_STATIC void
 md5_finish(md5_state_t *pms, md5_byte_t digest[16])
 {
     static const md5_byte_t pad[64] = {
-	0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+        0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
     };
     md5_byte_t data[8];
     int i;
 
     /* Save the length before padding. */
     for (i = 0; i < 8; ++i)
-	data[i] = (md5_byte_t)(pms->count[i >> 2] >> ((i & 3) << 3));
+        data[i] = (md5_byte_t)(pms->count[i >> 2] >> ((i & 3) << 3));
     /* Pad to 56 bytes mod 64. */
     md5_append(pms, pad, ((55 - (pms->count[0] >> 3)) & 63) + 1);
     /* Append the length. */
     md5_append(pms, data, 8);
     for (i = 0; i < 16; ++i)
-	digest[i] = (md5_byte_t)(pms->abcd[i >> 2] >> ((i & 3) << 3));
+        digest[i] = (md5_byte_t)(pms->abcd[i >> 2] >> ((i & 3) << 3));
 }

src/mod_lua.inl

@@ -3,12 +3,13 @@
 
 #ifdef _WIN32
 static void *mmap(void *addr, int64_t len, int prot, int flags, int fd,
-                  int offset) {
-  HANDLE fh = (HANDLE) _get_osfhandle(fd);
-  HANDLE mh = CreateFileMapping(fh, 0, PAGE_READONLY, 0, 0, 0);
-  void *p = MapViewOfFile(mh, FILE_MAP_READ, 0, 0, (size_t) len);
-  CloseHandle(mh);
-  return p;
+                  int offset)
+{
+    HANDLE fh = (HANDLE) _get_osfhandle(fd);
+    HANDLE mh = CreateFileMapping(fh, 0, PAGE_READONLY, 0, 0, 0);
+    void *p = MapViewOfFile(mh, FILE_MAP_READ, 0, 0, (size_t) len);
+    CloseHandle(mh);
+    return p;
 }
 #define munmap(x, y)  UnmapViewOfFile(x)
 #define MAP_FAILED NULL
@@ -25,370 +26,393 @@ static void handle_request(struct mg_connection *);
 static int handle_lsp_request(struct mg_connection *, const char *,
                               struct file *, struct lua_State *);
 
-static void reg_string(struct lua_State *L, const char *name, const char *val) {
-  lua_pushstring(L, name);
-  lua_pushstring(L, val);
-  lua_rawset(L, -3);
+static void reg_string(struct lua_State *L, const char *name, const char *val)
+{
+    lua_pushstring(L, name);
+    lua_pushstring(L, val);
+    lua_rawset(L, -3);
 }
 
-static void reg_int(struct lua_State *L, const char *name, int val) {
-  lua_pushstring(L, name);
-  lua_pushinteger(L, val);
-  lua_rawset(L, -3);
+static void reg_int(struct lua_State *L, const char *name, int val)
+{
+    lua_pushstring(L, name);
+    lua_pushinteger(L, val);
+    lua_rawset(L, -3);
 }
 
 static void reg_function(struct lua_State *L, const char *name,
-                         lua_CFunction func, struct mg_connection *conn) {
-  lua_pushstring(L, name);
-  lua_pushlightuserdata(L, conn);
-  lua_pushcclosure(L, func, 1);
-  lua_rawset(L, -3);
+                         lua_CFunction func, struct mg_connection *conn)
+{
+    lua_pushstring(L, name);
+    lua_pushlightuserdata(L, conn);
+    lua_pushcclosure(L, func, 1);
+    lua_rawset(L, -3);
 }
 
-static int lsp_sock_close(lua_State *L) {
-  if (lua_gettop(L) > 0 && lua_istable(L, -1)) {
-    lua_getfield(L, -1, "sock");
-    closesocket((SOCKET) lua_tonumber(L, -1));
-  } else {
-    return luaL_error(L, "invalid :close() call");
-  }
-  return 1;
+static int lsp_sock_close(lua_State *L)
+{
+    if (lua_gettop(L) > 0 && lua_istable(L, -1)) {
+        lua_getfield(L, -1, "sock");
+        closesocket((SOCKET) lua_tonumber(L, -1));
+    } else {
+        return luaL_error(L, "invalid :close() call");
+    }
+    return 1;
 }
 
-static int lsp_sock_recv(lua_State *L) {
-  char buf[2000];
-  int n;
-
-  if (lua_gettop(L) > 0 && lua_istable(L, -1)) {
-    lua_getfield(L, -1, "sock");
-    n = recv((SOCKET) lua_tonumber(L, -1), buf, sizeof(buf), 0);
-    if (n <= 0) {
-      lua_pushnil(L);
+static int lsp_sock_recv(lua_State *L)
+{
+    char buf[2000];
+    int n;
+
+    if (lua_gettop(L) > 0 && lua_istable(L, -1)) {
+        lua_getfield(L, -1, "sock");
+        n = recv((SOCKET) lua_tonumber(L, -1), buf, sizeof(buf), 0);
+        if (n <= 0) {
+            lua_pushnil(L);
+        } else {
+            lua_pushlstring(L, buf, n);
+        }
     } else {
-      lua_pushlstring(L, buf, n);
+        return luaL_error(L, "invalid :close() call");
     }
-  } else {
-    return luaL_error(L, "invalid :close() call");
-  }
-  return 1;
+    return 1;
 }
 
-static int lsp_sock_send(lua_State *L) {
-  const char *buf;
-  size_t len, sent = 0;
-  int n, sock;
-
-  if (lua_gettop(L) > 1 && lua_istable(L, -2) && lua_isstring(L, -1)) {
-    buf = lua_tolstring(L, -1, &len);
-    lua_getfield(L, -2, "sock");
-    sock = (int) lua_tonumber(L, -1);
-    while (sent < len) {
-      if ((n = send(sock, buf + sent, len - sent, 0)) <= 0) {
-        break;
-      }
-      sent += n;
+static int lsp_sock_send(lua_State *L)
+{
+    const char *buf;
+    size_t len, sent = 0;
+    int n, sock;
+
+    if (lua_gettop(L) > 1 && lua_istable(L, -2) && lua_isstring(L, -1)) {
+        buf = lua_tolstring(L, -1, &len);
+        lua_getfield(L, -2, "sock");
+        sock = (int) lua_tonumber(L, -1);
+        while (sent < len) {
+            if ((n = send(sock, buf + sent, len - sent, 0)) <= 0) {
+                break;
+            }
+            sent += n;
+        }
+        lua_pushnumber(L, n);
+    } else {
+        return luaL_error(L, "invalid :close() call");
     }
-    lua_pushnumber(L, n);
-  } else {
-    return luaL_error(L, "invalid :close() call");
-  }
-  return 1;
+    return 1;
 }
 
 static const struct luaL_Reg luasocket_methods[] = {
-  {"close", lsp_sock_close},
-  {"send", lsp_sock_send},
-  {"recv", lsp_sock_recv},
-  {NULL, NULL}
+    {"close", lsp_sock_close},
+    {"send", lsp_sock_send},
+    {"recv", lsp_sock_recv},
+    {NULL, NULL}
 };
 
-static int lsp_connect(lua_State *L) {
-  char ebuf[100];
-  SOCKET sock;
-
-  if (lua_isstring(L, -3) && lua_isnumber(L, -2) && lua_isnumber(L, -1)) {
-    sock = conn2(lua_tostring(L, -3), (int) lua_tonumber(L, -2),
-                 (int) lua_tonumber(L, -1), ebuf, sizeof(ebuf));
-    if (sock == INVALID_SOCKET) {
-      return luaL_error(L, ebuf);
+static int lsp_connect(lua_State *L)
+{
+    char ebuf[100];
+    SOCKET sock;
+
+    if (lua_isstring(L, -3) && lua_isnumber(L, -2) && lua_isnumber(L, -1)) {
+        sock = conn2(lua_tostring(L, -3), (int) lua_tonumber(L, -2),
+                     (int) lua_tonumber(L, -1), ebuf, sizeof(ebuf));
+        if (sock == INVALID_SOCKET) {
+            return luaL_error(L, ebuf);
+        } else {
+            lua_newtable(L);
+            reg_int(L, "sock", sock);
+            reg_string(L, "host", lua_tostring(L, -4));
+            luaL_getmetatable(L, LUASOCKET);
+            lua_setmetatable(L, -2);
+        }
     } else {
-      lua_newtable(L);
-      reg_int(L, "sock", sock);
-      reg_string(L, "host", lua_tostring(L, -4));
-      luaL_getmetatable(L, LUASOCKET);
-      lua_setmetatable(L, -2);
+        return luaL_error(L, "connect(host,port,is_ssl): invalid parameter given.");
     }
-  } else {
-    return luaL_error(L, "connect(host,port,is_ssl): invalid parameter given.");
-  }
-  return 1;
+    return 1;
 }
 
-static int lsp_error(lua_State *L) {
-  lua_getglobal(L, "mg");
-  lua_getfield(L, -1, "onerror");
-  lua_pushvalue(L, -3);
-  lua_pcall(L, 1, 0, 0);
-  return 0;
+static int lsp_error(lua_State *L)
+{
+    lua_getglobal(L, "mg");
+    lua_getfield(L, -1, "onerror");
+    lua_pushvalue(L, -3);
+    lua_pcall(L, 1, 0, 0);
+    return 0;
 }
 
 // Silently stop processing chunks.
-static void lsp_abort(lua_State *L) {
-  int top = lua_gettop(L);
-  lua_getglobal(L, "mg");
-  lua_pushnil(L);
-  lua_setfield(L, -2, "onerror");
-  lua_settop(L, top);
-  lua_pushstring(L, "aborting");
-  lua_error(L);
+static void lsp_abort(lua_State *L)
+{
+    int top = lua_gettop(L);
+    lua_getglobal(L, "mg");
+    lua_pushnil(L);
+    lua_setfield(L, -2, "onerror");
+    lua_settop(L, top);
+    lua_pushstring(L, "aborting");
+    lua_error(L);
 }
 
 static int lsp(struct mg_connection *conn, const char *path,
-               const char *p, int64_t len, lua_State *L) {
-  int i, j, pos = 0, lines = 1, lualines = 0;
-  char chunkname[MG_BUF_LEN];
-
-  for (i = 0; i < len; i++) {
-    if (p[i] == '\n') lines++;
-    if (p[i] == '<' && p[i + 1] == '?') {
-      for (j = i + 1; j < len ; j++) {
-        if (p[j] == '\n') lualines++;
-        if (p[j] == '?' && p[j + 1] == '>') {
-          mg_write(conn, p + pos, i - pos);
-
-          snprintf(chunkname, sizeof(chunkname), "@%s+%i", path, lines);
-          lua_pushlightuserdata(L, conn);
-          lua_pushcclosure(L, lsp_error, 1);
-          if (luaL_loadbuffer(L, p + (i + 2), j - (i + 2), chunkname)) {
-            // Syntax error or OOM. Error message is pushed on stack.
-            lua_pcall(L, 1, 0, 0);
-          } else {
-            // Success loading chunk. Call it.
-            lua_pcall(L, 0, 0, 1);
-          }
-
-          pos = j + 2;
-          i = pos - 1;
-          break;
+               const char *p, int64_t len, lua_State *L)
+{
+    int i, j, pos = 0, lines = 1, lualines = 0;
+    char chunkname[MG_BUF_LEN];
+
+    for (i = 0; i < len; i++) {
+        if (p[i] == '\n') lines++;
+        if (p[i] == '<' && p[i + 1] == '?') {
+            for (j = i + 1; j < len ; j++) {
+                if (p[j] == '\n') lualines++;
+                if (p[j] == '?' && p[j + 1] == '>') {
+                    mg_write(conn, p + pos, i - pos);
+
+                    snprintf(chunkname, sizeof(chunkname), "@%s+%i", path, lines);
+                    lua_pushlightuserdata(L, conn);
+                    lua_pushcclosure(L, lsp_error, 1);
+                    if (luaL_loadbuffer(L, p + (i + 2), j - (i + 2), chunkname)) {
+                        // Syntax error or OOM. Error message is pushed on stack.
+                        lua_pcall(L, 1, 0, 0);
+                    } else {
+                        // Success loading chunk. Call it.
+                        lua_pcall(L, 0, 0, 1);
+                    }
+
+                    pos = j + 2;
+                    i = pos - 1;
+                    break;
+                }
+            }
+            if (lualines > 0) {
+                lines += lualines;
+                lualines = 0;
+            }
         }
-      }
-      if (lualines > 0) {
-        lines += lualines;
-        lualines = 0;
-      }
     }
-  }
 
-  if (i > pos) {
-    mg_write(conn, p + pos, i - pos);
-  }
+    if (i > pos) {
+        mg_write(conn, p + pos, i - pos);
+    }
 
-  return 0;
+    return 0;
 }
 
-static int lsp_write(lua_State *L) {
-  int i, num_args;
-  const char *str;
-  size_t size;
-  struct mg_connection *conn = lua_touserdata(L, lua_upvalueindex(1));
-
-  num_args = lua_gettop(L);
-  for (i = 1; i <= num_args; i++) {
-    if (lua_isstring(L, i)) {
-      str = lua_tolstring(L, i, &size);
-      mg_write(conn, str, size);
+static int lsp_write(lua_State *L)
+{
+    int i, num_args;
+    const char *str;
+    size_t size;
+    struct mg_connection *conn = lua_touserdata(L, lua_upvalueindex(1));
+
+    num_args = lua_gettop(L);
+    for (i = 1; i <= num_args; i++) {
+        if (lua_isstring(L, i)) {
+            str = lua_tolstring(L, i, &size);
+            mg_write(conn, str, size);
+        }
     }
-  }
 
-  return 0;
+    return 0;
 }
 
-static int lsp_read(lua_State *L) {
-  struct mg_connection *conn = lua_touserdata(L, lua_upvalueindex(1));
-  char buf[1024];
-  int len = mg_read(conn, buf, sizeof(buf));
+static int lsp_read(lua_State *L)
+{
+    struct mg_connection *conn = lua_touserdata(L, lua_upvalueindex(1));
+    char buf[1024];
+    int len = mg_read(conn, buf, sizeof(buf));
 
-  if (len <= 0) return 0;
-  lua_pushlstring(L, buf, len);
+    if (len <= 0) return 0;
+    lua_pushlstring(L, buf, len);
 
-  return 1;
+    return 1;
 }
 
 // mg.include: Include another .lp file
-static int lsp_include(lua_State *L) {
-  struct mg_connection *conn = lua_touserdata(L, lua_upvalueindex(1));
-  struct file file = STRUCT_FILE_INITIALIZER;
-  if (handle_lsp_request(conn, lua_tostring(L, -1), &file, L)) {
-    // handle_lsp_request returned an error code, meaning an error occured in
-    // the included page and mg.onerror returned non-zero. Stop processing.
-    lsp_abort(L);
-  }
-  return 0;
+static int lsp_include(lua_State *L)
+{
+    struct mg_connection *conn = lua_touserdata(L, lua_upvalueindex(1));
+    struct file file = STRUCT_FILE_INITIALIZER;
+    if (handle_lsp_request(conn, lua_tostring(L, -1), &file, L)) {
+        // handle_lsp_request returned an error code, meaning an error occured in
+        // the included page and mg.onerror returned non-zero. Stop processing.
+        lsp_abort(L);
+    }
+    return 0;
 }
 
 // mg.cry: Log an error. Default value for mg.onerror.
-static int lsp_cry(lua_State *L){
-  struct mg_connection *conn = lua_touserdata(L, lua_upvalueindex(1));
-  cry(conn, "%s", lua_tostring(L, -1));
-  return 0;
+static int lsp_cry(lua_State *L)
+{
+    struct mg_connection *conn = lua_touserdata(L, lua_upvalueindex(1));
+    cry(conn, "%s", lua_tostring(L, -1));
+    return 0;
 }
 
 // mg.redirect: Redirect the request (internally).
-static int lsp_redirect(lua_State *L) {
-  struct mg_connection *conn = lua_touserdata(L, lua_upvalueindex(1));
-  conn->request_info.uri = lua_tostring(L, -1);
-  handle_request(conn);
-  lsp_abort(L);
-  return 0;
+static int lsp_redirect(lua_State *L)
+{
+    struct mg_connection *conn = lua_touserdata(L, lua_upvalueindex(1));
+    conn->request_info.uri = lua_tostring(L, -1);
+    handle_request(conn);
+    lsp_abort(L);
+    return 0;
 }
 
-static void prepare_lua_environment(struct mg_connection *conn, lua_State *L) {
-  const struct mg_request_info *ri = mg_get_request_info(conn);
-  extern void luaL_openlibs(lua_State *);
-  int i;
+static void prepare_lua_environment(struct mg_connection *conn, lua_State *L)
+{
+    const struct mg_request_info *ri = mg_get_request_info(conn);
+    extern void luaL_openlibs(lua_State *);
+    int i;
 
-  luaL_openlibs(L);
+    luaL_openlibs(L);
 #ifdef USE_LUA_SQLITE3
-  { extern int luaopen_lsqlite3(lua_State *); luaopen_lsqlite3(L); }
+    {
+        extern int luaopen_lsqlite3(lua_State *);
+        luaopen_lsqlite3(L);
+    }
 #endif
 
-  luaL_newmetatable(L, LUASOCKET);
-  lua_pushliteral(L, "__index");
-  luaL_newlib(L, luasocket_methods);
-  lua_rawset(L, -3);
-  lua_pop(L, 1);
-  lua_register(L, "connect", lsp_connect);
-
-  if (conn == NULL) return;
-
-  // Register mg module
-  lua_newtable(L);
-
-  reg_function(L, "read", lsp_read, conn);
-  reg_function(L, "write", lsp_write, conn);
-  reg_function(L, "cry", lsp_cry, conn);
-  reg_function(L, "include", lsp_include, conn);
-  reg_function(L, "redirect", lsp_redirect, conn);
-  reg_string(L, "version", CIVETWEB_VERSION);
-
-  // Export request_info
-  lua_pushstring(L, "request_info");
-  lua_newtable(L);
-  reg_string(L, "request_method", ri->request_method);
-  reg_string(L, "uri", ri->uri);
-  reg_string(L, "http_version", ri->http_version);
-  reg_string(L, "query_string", ri->query_string);
-  reg_int(L, "remote_ip", ri->remote_ip);
-  reg_int(L, "remote_port", ri->remote_port);
-  reg_int(L, "num_headers", ri->num_headers);
-  lua_pushstring(L, "http_headers");
-  lua_newtable(L);
-  for (i = 0; i < ri->num_headers; i++) {
-    reg_string(L, ri->http_headers[i].name, ri->http_headers[i].value);
-  }
-  lua_rawset(L, -3);
-  lua_rawset(L, -3);
-
-  lua_setglobal(L, "mg");
-
-  // Register default mg.onerror function
-  luaL_dostring(L, "mg.onerror = function(e) mg.write('\\nLua error:\\n', "
-                "debug.traceback(e, 1)) end");
+    luaL_newmetatable(L, LUASOCKET);
+    lua_pushliteral(L, "__index");
+    luaL_newlib(L, luasocket_methods);
+    lua_rawset(L, -3);
+    lua_pop(L, 1);
+    lua_register(L, "connect", lsp_connect);
+
+    if (conn == NULL) return;
+
+    // Register mg module
+    lua_newtable(L);
+
+    reg_function(L, "read", lsp_read, conn);
+    reg_function(L, "write", lsp_write, conn);
+    reg_function(L, "cry", lsp_cry, conn);
+    reg_function(L, "include", lsp_include, conn);
+    reg_function(L, "redirect", lsp_redirect, conn);
+    reg_string(L, "version", CIVETWEB_VERSION);
+
+    // Export request_info
+    lua_pushstring(L, "request_info");
+    lua_newtable(L);
+    reg_string(L, "request_method", ri->request_method);
+    reg_string(L, "uri", ri->uri);
+    reg_string(L, "http_version", ri->http_version);
+    reg_string(L, "query_string", ri->query_string);
+    reg_int(L, "remote_ip", ri->remote_ip);
+    reg_int(L, "remote_port", ri->remote_port);
+    reg_int(L, "num_headers", ri->num_headers);
+    lua_pushstring(L, "http_headers");
+    lua_newtable(L);
+    for (i = 0; i < ri->num_headers; i++) {
+        reg_string(L, ri->http_headers[i].name, ri->http_headers[i].value);
+    }
+    lua_rawset(L, -3);
+    lua_rawset(L, -3);
+
+    lua_setglobal(L, "mg");
+
+    // Register default mg.onerror function
+    luaL_dostring(L, "mg.onerror = function(e) mg.write('\\nLua error:\\n', "
+                  "debug.traceback(e, 1)) end");
 }
 
-static int lua_error_handler(lua_State *L) {
-  const char *error_msg =  lua_isstring(L, -1) ?  lua_tostring(L, -1) : "?\n";
-
-  lua_getglobal(L, "mg");
-  if (!lua_isnil(L, -1)) {
-    lua_getfield(L, -1, "write");   // call mg.write()
-    lua_pushstring(L, error_msg);
-    lua_pushliteral(L, "\n");
-    lua_call(L, 2, 0);
-    luaL_dostring(L, "mg.write(debug.traceback(), '\\n')");
-  } else {
-    printf("Lua error: [%s]\n", error_msg);
-    luaL_dostring(L, "print(debug.traceback(), '\\n')");
-  }
-  // TODO(lsm): leave the stack balanced
-
-  return 0;
+static int lua_error_handler(lua_State *L)
+{
+    const char *error_msg =  lua_isstring(L, -1) ?  lua_tostring(L, -1) : "?\n";
+
+    lua_getglobal(L, "mg");
+    if (!lua_isnil(L, -1)) {
+        lua_getfield(L, -1, "write");   // call mg.write()
+        lua_pushstring(L, error_msg);
+        lua_pushliteral(L, "\n");
+        lua_call(L, 2, 0);
+        luaL_dostring(L, "mg.write(debug.traceback(), '\\n')");
+    } else {
+        printf("Lua error: [%s]\n", error_msg);
+        luaL_dostring(L, "print(debug.traceback(), '\\n')");
+    }
+    // TODO(lsm): leave the stack balanced
+
+    return 0;
 }
 
 void mg_exec_lua_script(struct mg_connection *conn, const char *path,
-                        const void **exports) {
-  int i;
-  lua_State *L;
-
-  if (path != NULL && (L = luaL_newstate()) != NULL) {
-    prepare_lua_environment(conn, L);
-    lua_pushcclosure(L, &lua_error_handler, 0);
-
-    lua_pushglobaltable(L);
-    if (exports != NULL) {
-      for (i = 0; exports[i] != NULL && exports[i + 1] != NULL; i += 2) {
-        lua_pushstring(L, exports[i]);
-        lua_pushcclosure(L, (lua_CFunction) exports[i + 1], 0);
-        lua_rawset(L, -3);
-      }
-    }
+                        const void **exports)
+{
+    int i;
+    lua_State *L;
+
+    if (path != NULL && (L = luaL_newstate()) != NULL) {
+        prepare_lua_environment(conn, L);
+        lua_pushcclosure(L, &lua_error_handler, 0);
+
+        lua_pushglobaltable(L);
+        if (exports != NULL) {
+            for (i = 0; exports[i] != NULL && exports[i + 1] != NULL; i += 2) {
+                lua_pushstring(L, exports[i]);
+                lua_pushcclosure(L, (lua_CFunction) exports[i + 1], 0);
+                lua_rawset(L, -3);
+            }
+        }
 
-    if (luaL_loadfile(L, path) != 0) {
-      lua_error_handler(L);
+        if (luaL_loadfile(L, path) != 0) {
+            lua_error_handler(L);
+        }
+        lua_pcall(L, 0, 0, -2);
+        lua_close(L);
     }
-    lua_pcall(L, 0, 0, -2);
-    lua_close(L);
-  }
 }
 
 static void lsp_send_err(struct mg_connection *conn, struct lua_State *L,
-                         const char *fmt, ...) {
-  char buf[MG_BUF_LEN];
-  va_list ap;
-  int len;
-
-  va_start(ap, fmt);
-  len = vsnprintf(buf, sizeof(buf), fmt, ap);
-  va_end(ap);
-
-  if (L == NULL) {
-    send_http_error(conn, 500, http_500_error, "%s", buf);
-  } else {
-    lua_pushstring(L, buf);
-    lua_error(L);
-  }
+                         const char *fmt, ...)
+{
+    char buf[MG_BUF_LEN];
+    va_list ap;
+    int len;
+
+    va_start(ap, fmt);
+    len = vsnprintf(buf, sizeof(buf), fmt, ap);
+    va_end(ap);
+
+    if (L == NULL) {
+        send_http_error(conn, 500, http_500_error, "%s", buf);
+    } else {
+        lua_pushstring(L, buf);
+        lua_error(L);
+    }
 }
 
 static int handle_lsp_request(struct mg_connection *conn, const char *path,
-                               struct file *filep, struct lua_State *ls) {
-  void *p = NULL;
-  lua_State *L = NULL;
-  int error = 1;
-
-  // We need both mg_stat to get file size, and mg_fopen to get fd
-  if (!mg_stat(conn, path, filep) || !mg_fopen(conn, path, "r", filep)) {
-    lsp_send_err(conn, ls, "File [%s] not found", path);
-  } else if (filep->membuf == NULL &&
-             (p = mmap(NULL, (size_t) filep->size, PROT_READ, MAP_PRIVATE,
-                       fileno(filep->fp), 0)) == MAP_FAILED) {
-    lsp_send_err(conn, ls, "mmap(%s, %zu, %d): %s", path, (size_t) filep->size,
-              fileno(filep->fp), strerror(errno));
-  } else if ((L = ls != NULL ? ls : luaL_newstate()) == NULL) {
-    send_http_error(conn, 500, http_500_error, "%s", "luaL_newstate failed");
-  } else {
-    // We're not sending HTTP headers here, Lua page must do it.
-    if (ls == NULL) {
-      prepare_lua_environment(conn, L);
-      if (conn->ctx->callbacks.init_lua != NULL) {
-        conn->ctx->callbacks.init_lua(conn, L);
-      }
+                              struct file *filep, struct lua_State *ls)
+{
+    void *p = NULL;
+    lua_State *L = NULL;
+    int error = 1;
+
+    // We need both mg_stat to get file size, and mg_fopen to get fd
+    if (!mg_stat(conn, path, filep) || !mg_fopen(conn, path, "r", filep)) {
+        lsp_send_err(conn, ls, "File [%s] not found", path);
+    } else if (filep->membuf == NULL &&
+               (p = mmap(NULL, (size_t) filep->size, PROT_READ, MAP_PRIVATE,
+                         fileno(filep->fp), 0)) == MAP_FAILED) {
+        lsp_send_err(conn, ls, "mmap(%s, %zu, %d): %s", path, (size_t) filep->size,
+                     fileno(filep->fp), strerror(errno));
+    } else if ((L = ls != NULL ? ls : luaL_newstate()) == NULL) {
+        send_http_error(conn, 500, http_500_error, "%s", "luaL_newstate failed");
+    } else {
+        // We're not sending HTTP headers here, Lua page must do it.
+        if (ls == NULL) {
+            prepare_lua_environment(conn, L);
+            if (conn->ctx->callbacks.init_lua != NULL) {
+                conn->ctx->callbacks.init_lua(conn, L);
+            }
+        }
+        error = lsp(conn, path, filep->membuf == NULL ? p : filep->membuf,
+                    filep->size, L);
     }
-    error = lsp(conn, path, filep->membuf == NULL ? p : filep->membuf,
-                filep->size, L);
-  }
-
-  if (L != NULL && ls == NULL) lua_close(L);
-  if (p != NULL) munmap(p, filep->size);
-  mg_fclose(filep);
-  return error;
+
+    if (L != NULL && ls == NULL) lua_close(L);
+    if (p != NULL) munmap(p, filep->size);
+    mg_fclose(filep);
+    return error;
 }