New server option -F to force start even when state looks bad

[empserver] / src / lib / subs / fileinit.c

diff --git a/src/lib/subs/fileinit.c b/src/lib/subs/fileinit.c
index 4664b5e3661607fd11c852ef19d30d513aead789..b3c3129290e661dd7c6caf6206b975933b4fef21 100644 (file)
--- a/src/lib/subs/fileinit.c
+++ b/src/lib/subs/fileinit.c
@@ -28,7 +28,7 @@
  *
  *  Known contributors to this file:
  *     Ron Koenderink, 2005
- *     Markus Armbruster, 2005-2008
+ *     Markus Armbruster, 2005-2011
  */
 
 #include <config.h>
@@ -60,7 +60,7 @@ static void ef_close_srv(void);
  * Initialize empfile for full server operations.
  */
 void
-ef_init_srv(void)
+ef_init_srv(int force_bad_state)
 {
     unsigned i;
 
@@ -71,9 +71,14 @@ ef_init_srv(void)
     }
 
     nsc_init();
+    if (ef_verify_config() < 0)
+       exit(EXIT_FAILURE);
     ef_open_srv();
-    if (ef_verify() < 0)
+    if (ef_verify_state(1) < 0 && !force_bad_state) {
+       fprintf(stderr, "You can try -F to force running anyway,"
+               " but that's risky; see the manual page\n");
        exit(EXIT_FAILURE);
+    }
     global_init();
     unit_cargo_init();
 }