Merge pull request #170 from acv/split-main

Refactor main() to allow for unit tests

Author: mhaas

.gitignore

@@ -1,6 +1,7 @@
 *.swp
 .DS_Store
 *.o
+*.a
 *.la
 *.so
 *.lo

src/Makefile.am

@@ -2,6 +2,8 @@
 # $Id$
 #
 
+noinst_LIBRARIES = libgateway.a
+
 bin_PROGRAMS = wifidog \
 	wdctl
 
@@ -11,9 +13,11 @@ AM_CPPFLAGS = \
 	-Wall \
 	-Wextra \
 	-Wno-unused-parameter
-wifidog_LDADD = $(top_builddir)/libhttpd/libhttpd.la
+wifidog_LDADD = libgateway.a $(top_builddir)/libhttpd/libhttpd.la
+
+wifidog_SOURCES = main.c
 
-wifidog_SOURCES = commandline.c \
+libgateway_a_SOURCES = commandline.c \
 	conf.c \
 	debug.c \
 	fw_iptables.c \
@@ -51,4 +55,6 @@ noinst_HEADERS = commandline.h \
 	simple_http.h \
 	pstring.h
 
+wdctl_LDADD = libgateway.a
+
 wdctl_SOURCES = wdctl.c

src/gateway.c

@@ -19,7 +19,6 @@
  *                                                                  *
  \********************************************************************/
 
-/* $Id$ */
 /** @internal
   @file gateway.c
   @brief Main loop
@@ -483,7 +482,7 @@ main_loop(void)
 
 /** Reads the configuration file and then starts the main loop */
 int
-main(int argc, char **argv)
+gw_main(int argc, char **argv)
 {
 
     s_config *config = config_get_config();

src/gateway.h

@@ -28,13 +28,18 @@
 #ifndef _GATEWAY_H_
 #define _GATEWAY_H_
 
+#include <stdio.h>
+
 #include "httpd.h"
 
 extern time_t started_time;
 
-/* The internal web server */
+/** @brief The internal web server */
 extern httpd *webserver;
 
+/** @brief actual program entry point. */
+int gw_main(int, char **);
+
 /** @brief exits cleanly and clear the firewall rules. */
 void termination_handler(int s);
 

src/main.c

@@ -0,0 +1,34 @@
+/* vim: set et sw=4 ts=4 sts=4 : */
+/********************************************************************\
+ * This program is free software; you can redistribute it and/or    *
+ * modify it under the terms of the GNU General Public License as   *
+ * published by the Free:Software Foundation; either version 2 of   *
+ * the License, or (at your option) any later version.              *
+ *                                                                  *
+ * This program is distributed in the hope that it will be useful,  *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of   *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the    *
+ * GNU General Public License for more details.                     *
+ *                                                                  *
+ * You should have received a copy of the GNU General Public License*
+ * along with this program; if not, contact:                        *
+ *                                                                  *
+ * Free Software Foundation           Voice:  +1-617-542-5942       *
+ * 59 Temple Place - Suite 330        Fax:    +1-617-542-2652       *
+ * Boston, MA  02111-1307,  USA       [email protected]                   *
+ *                                                                  *
+ \********************************************************************/
+
+/** @internal
+  @file main.c
+  @brief Entry point only
+  @author Copyright (C) 2015 Alexandre Carmel-Veilleux <[email protected]>
+ */
+
+#include "gateway.h"
+
+int
+main(int argc, char **argv)
+{
+    return gw_main(argc, argv);
+}